summaryrefslogtreecommitdiff
path: root/x11-libs/wxGTK
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-libs/wxGTK
reinit the tree, so we can have metadata
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r--x11-libs/wxGTK/Manifest24
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch39
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch74
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch13
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch27
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch25
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch77
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch304
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch11
-rw-r--r--x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch75
-rw-r--r--x11-libs/wxGTK/files/wxGTK-3.0.2.0-gcc6.patch39
-rw-r--r--x11-libs/wxGTK/files/wxGTK-3.0.2.0-webview-fixes.patch140
-rw-r--r--x11-libs/wxGTK/metadata.xml28
-rw-r--r--x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild186
-rw-r--r--x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild188
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild173
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild158
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild165
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild184
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild194
20 files changed, 2124 insertions, 0 deletions
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
new file mode 100644
index 000000000000..a4bf22087b85
--- /dev/null
+++ b/x11-libs/wxGTK/Manifest
@@ -0,0 +1,24 @@
+AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698 SHA512 119e99f06f238d0982bc1a5fac834ef0ca7c09dc5a97f612cf3f0fffd9e01eebb0d8bfe122ebff6f3857cf6518a226477d2cb5959c47c4fd5c50ea5040abe6b2 WHIRLPOOL ac8f565adeaee0110e6e2b229cd9c5afd3edf3bc3b7abb8aba5347dac64021a255a63dbf879b5ddcbc658f6f78518c988435399af0af1f5fd437f36dc102cfc8
+AUX wxGTK-2.8.11-collision.patch 5712 SHA256 33cbfadeb9890d4790c4c912512f510c93b985a1afad8a6ebc7863dbf5171eb3 SHA512 55a5e55a7233e0ca99f7604bcd6c71816d2ba7630056c8c67d78c2b6080e26c010f6b3120b7d46b32818ce6dc1b09d97b8295fe23628c561e2079483922baf13 WHIRLPOOL 0a842206ce6d7f45bb897c75fa1c222b5a931a82aa1521f2c3675a421ac26e7999ecc663891ef417c85bfbe819c3cfa775fa405189d36a4437aea0162e407935
+AUX wxGTK-2.8.11-unicode-odbc.patch 624 SHA256 2e2cbeb2240770497611bf845127f737e67311c4b898d21446fc3d739941cb65 SHA512 e58e661ae95deb7da31c7742088c6e8b8705494261d00975a7dd0eba0fc720ae7d91017616152915849b747c96f3a0302cd958946db886d7491520883f311a86 WHIRLPOOL 710ac8ada38a42d762ea1d271540b9eb47aae36a072b1b63310b4c1e970afc7b0b485cc55a50691d69f92712e3b772d35d72ae1e24dc550a9e0b60db8c20ace5
+AUX wxGTK-2.8.12.1-autoconf.patch 1140 SHA256 2e5149490f98780a53ca6d313c103b55c846ce8d00a5cfd148e8bca6418bf3b3 SHA512 533c6c2f3611b8af4b6dc954aa09a3c70197ad7fe7fb1874c7c6f61b48e45355c41bdb7fb4379fea9e418ed0f547332d6083f60c6382d090b1700f213ede9b20 WHIRLPOOL 0f31c75e79e0dae6eb12709f5f5119a927e401883a2a78e7a966d4c1d2f92aadcd0d5b4a404fabe4dfb2a9a1330b0266c07c39e1382b66d6dfb186b63626ad1b
+AUX wxGTK-2.8.12.1-bakefile.patch 653 SHA256 1c1446fd783c5c6bf0c62013997f99f6c81489cbb97a1706219d2b395fce035b SHA512 9235ab4ff1117bb15ae88a4f9a836e30af3cee6b897031a8a89bbe1ee87df7a700bd2d6a2dce01e8e96ced2aff52ea4265490103a80a18e8fc54d4e7e59dcc08 WHIRLPOOL bb9c88918f47a73ebf761c2dfc10c209141b3e28c6b0b374ef7313e2e23023880fd0b2778ed0960b9f98b0fc968913996ee7ddb9dffa3efd04319f8506d61221
+AUX wxGTK-2.8.12.1-fix-c++14.patch 4518 SHA256 42ce51e6e73a1035908cba7b0c6d4a675705d9c79a735f8be197571c8f15e23f SHA512 cd7fc58e883ff9ef185bc8deff333f7a785d8bd3e8abebef741b598436bc486f2904540be7d2c891ef070b45008f2e5f5961c7978b0a8166ef259e17b7481739 WHIRLPOOL 9061f79d131181f434963ee6ffcc31de7a4c46417bec16271eeab5800e68a8786ef347e95c1ed810a1d7c88ef1851e80da236efa23f32d71b1e733a1a18a36d4
+AUX wxGTK-2.8.12.1-libdir.patch 13266 SHA256 11ab90519588c7ba601bc6b7f239d7230f75cab19afd2f41ae11839b9528ed70 SHA512 15eb72936176bfe03b5acb7d52c4158fe4f6bdf9870e72aab8d41e1689ee9886aa3bc8216e782abb756d06607bcedbec184575a2e9634f67f6add1b930297671 WHIRLPOOL e8a8f123bbd92e28a18de86e0c34694406c3eca52e78cfb5b937d49cc0c9a5d1f9d467870076d0c6d3ce973e5c4bfad8b1618d7f2f0a4051241361d94514cb79
+AUX wxGTK-2.8.7-mmedia.patch 518 SHA256 c313fec2d7eca6099aeaa90e047eb475a9ebcdc191a922cb095a3757fdde116e SHA512 8577a701f5d0d03296d2d2dbb3a041023cf7adffc2d09492d2ebd094e0a6796e27abe1f442fee92e661f0f1ea6268499c37ace042cc1434b80aac58639bbc56c WHIRLPOOL 484dc4e09a94296cd0b85bc80a0c2d3070640e547f5900547aee4cd51b020d72578ba544a8f6b2a26ed14882e70a130b0fdce9cbbf01255a96c4e794efbbb6e3
+AUX wxGTK-3.0.0.0-collision.patch 6237 SHA256 9bfd909e4f953810b84e068b0ec5c709f3ff0a286c3d599fc7b1b26b96bef8d8 SHA512 c68ac400ddc4531d81a251acf1efc4440a5a17d78d9767427121f4ca0425a179a9cdfa94f22ecad0f2cd8f4bf3a4c799a4e21878e93367b57e206f2504a2724f WHIRLPOOL 1d9f7eba01e72bd662eb4c94a92a0bc7193b60f79559b00d2844dffa3c43c748c718491769daffc140c39895382621ca0c59229933f694d948d74379a1756d65
+AUX wxGTK-3.0.2.0-gcc6.patch 1077 SHA256 6e659eb4f1cfbfe31e0da0c8719e496e16efa5be36265388a639964e4b39cf78 SHA512 6da02b4cdd6e4d33cfd8da5554f1400e2ccb33de7fa12d9da23a8eeac52c724fa339d2e1d413abf5f4590cf0514cf9a8d951589d3e498aae936ab10caf93f585 WHIRLPOOL cb35ef7ae5da54a95f1e493027832f92b001c8c3ed353f5ca47785b3e666c9106237908ebd81280c0d49a9715da74ef3bef029db6429d93fb576cc6c56c57749
+AUX wxGTK-3.0.2.0-webview-fixes.patch 9132 SHA256 964124da1affd2aa62bbbd12298ff692e69e4e149d9c25062d6fa40f3f8995a1 SHA512 61ff21971d1527cd721f8d2c525e2d55de65f1935135c3cf6c20e0097ef08518f43a7bd96e3d49e22de19dc68462896ab4f7c8679c9632f392b8a0a64df9bc90 WHIRLPOOL c6ac4adfa2f0644859ebf91d5d8b843262bda18119d02a604291c073c72eac3773387b5891fa43b3ac6a6b72511acdb89b181b0c2fb1c2ddd887cb83f6675918
+DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 SHA256 9e9b32b7452f8f1885f0326c0382ec1878c68a251146b3e3997c7c3aa70caa57 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e WHIRLPOOL ac0b4cd1937c31803399f2d9172158f00f99886462becfb58c3553c263bfe93d54acf5f05662227aeda4fd44610ada0680127b05e165b261104b765f25185715
+DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
+DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d
+EBUILD wxGTK-2.8.12.1-r1.ebuild 4151 SHA256 0a0a84551d4cb5b0d74fd80e2aabe87cb1cf10412c6088dfa657b1ee9242c9c8 SHA512 1443d388b8628d7d12c4ac8b4731142c47bc2d81a72edf14f1d502b251b8bff4e46e02843432bf139a4480f5d2ee824b680f955c752546bcb033fd8b086b4f4b WHIRLPOOL acfd903a2402a49558dd60a238117234474ac8ef651482a649253ba562b459f1c4876dbc03c187e72382778ca12aa35422206215347080d4d0fbe04142d1ca1a
+EBUILD wxGTK-2.8.12.1-r2.ebuild 4797 SHA256 29b3747dc7822e01c4a1577c23c912ff1115169e034cf8f3271ae723730e4463 SHA512 6d5c3f1a751184b97f748ea4e66967d48488d68818f6ecd8907f9c517b307b6a5e98199a2feafd3c064a2eaa9ddfa6b3f3566b5844cbbf4be5ae6271d8d887d5 WHIRLPOOL 7ed4f397092d3933ac940e115a974970ecc14efc93e52dd0984fed73072b68e966f497c86578213e455760ee716befab39884c7425930db1378db8304fb9208c
+EBUILD wxGTK-3.0.2.0-r1.ebuild 4050 SHA256 6c75e6956ca184e34bb00957fb018738fdaf30ee34e77680550e18fc8d9dff7a SHA512 29bb0f8a4ee4a395b07e03f97edba208eb23455ac5301f8125aaf838cb23152e269ff94f6690b03c54fe7b40ffea0e71495b10b3ef4fa480ac8e7bfacc95d1e7 WHIRLPOOL 11f54f4ee367f1e5f0a7cf7bc9b53685517e8a219a9f029367cdedd697ebe95da2d8089288afa6a04cd15b203b560d16fae8aedb7a4e6be39ee58184dfb538dc
+EBUILD wxGTK-3.0.2.0-r2.ebuild 4320 SHA256 1a480296e19b553d8375ce80af027f0736f7c14fda103239009e68bca6e9c4b9 SHA512 de38e3260dce0be34b363e40c562421fac18250fb69937e62f81b32863a2b3a6e5e416bf56b3d8783fc8c9eb7fe27482be2d1695293217231a0b380f00a23753 WHIRLPOOL 1279002ce1a7a475d030b1f5dc3a2a63eab3c64cc4708745eab7106588a3e4881ad8540a7f8d0ad40b0d3eec9a838a5fc24d7bc0db24f1d8dfcfd2ad2b7f7943
+EBUILD wxGTK-3.0.2.0-r3.ebuild 4546 SHA256 9579864d5eb45e1f837c9f2368afaf350daddf8cf769f129b8a15f5c06ac3905 SHA512 81d76b4b9e8f970d270dc44aa794282566d87a71f21b2a2fc3bccd21035029b14c3451ce7c6e7ad46b3c8ad5795a329d459e324e5ab7b4b9d0a53d459ee5e51b WHIRLPOOL 623095e91e0d85fd57e4992c7c834422bc3b209ea83388be8d0803ec73b6c53a16c2276f394f51dddf59fb2840eac04f9deb456aa1f1b35556405c8da9c48126
+EBUILD wxGTK-3.0.2.0-r300.ebuild 5061 SHA256 70cff1ba81a54f596009696b7af6f80091d388fda1569bff286232c2350bbe6d SHA512 471536934d7655541c1962745897c414667c5e3adf1b0b4cc1bd0efffddd123936f164b030eb1f71d77f095b06f64e796c0253f8c7d235de6908585845746d55 WHIRLPOOL 4169fe472dfdbcf1bf3092ad81b386036108cd1179ce7d1fb61180b42e1737ed4104f5e3d39c0f0c2582917d84ca8b50074d6b028a0a8ff5746ea6bbf4c59592
+EBUILD wxGTK-3.0.2.0-r301.ebuild 5291 SHA256 e1ce55ceb57fd7d4c0f1045d35320f6e9f8d7fb01502c53a3a823e6009e905fc SHA512 4f676e491500026cc9bac53d2c02f6cc6fe39a127b50d2a407cc0ba4dc6465980349ef87c383b111d997379d812ed647f4b76ce58285a93c7d332a10300f7d4d WHIRLPOOL 26abd8a92c4af38a7e13c3e744dcad5634469deb9c500a7e5b6ad09ee259222170f96e0f9bfbcd0b4062a7b8ce2dd9e0bfe088e75c50efc862d4f92a4bc0f91a
+MISC ChangeLog 8466 SHA256 6f3dbb1da8163b5a82e19644aeca0c6efe63b1cbde44460144a37ca4172b478f SHA512 67ad03b635a82a26f06681911898cd2fe51098cc0531260cc56364aa4b0f7bba3987ffa213be0ae25449315a945f346cc8d9fe5b7ae356ae33e4415bc159dfba WHIRLPOOL 6c27c95e2d94233b3b6fff1fd63635ae09ed20821cf4993fb2d2087047cce9b5b400a13d124153cac52771cc8376a9a785aaf232c3e6c224200e4448b95282b2
+MISC ChangeLog-2015 51140 SHA256 33dec29a979f11894bec04d7a3fac0f64ef402e089a3ce80822790cfa922e555 SHA512 415ef31c4937cd3024a27b8e64463d1d9a38997c1e09fa007072a32a9d64b4fccd324731276f500ce388eb1189268ff0fa8e78e42ef1d8fe9cba283bb3b1850a WHIRLPOOL c89fb3370b227c0b3d5ca0addc9e1f01cf20cbc6cf5c4dd6611b0a890cb71878b57ddcbd0361c85726211b0d60f5b2d9da5b730fc4f895928aea7c61bc2ceb17
+MISC metadata.xml 856 SHA256 e0404abad32321aea90893545bbb40c0ca1958b1cc05ba9b761d290af8de130d SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb WHIRLPOOL 50f33b82303e32f48001139070c4412b8c4b5b2aa0772e707dc25dff0235fbc2c0f4a2e0d601d067c4924f56f013739f4cb5e382b83b1482ffd405e1c257c27d
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.
diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml
new file mode 100644
index 000000000000..e8b0e7257496
--- /dev/null
+++ b/x11-libs/wxGTK/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>wxwidgets@gentoo.org</email>
+ <description>All modifications to this package must be approved by the wxwidgets herd.</description>
+ </maintainer>
+ <use>
+ <flag name="gstreamer">
+ 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.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">wxpython</remote-id>
+ </upstream>
+ <slots>
+ <slot name="*">Slots reflect MAJOR.MINOR versions which can
+ be installed in parallel.</slot>
+ </slots>
+</pkgmetadata>
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
new file mode 100644
index 000000000000..c2906c3f8b18
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib versionator
+
+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
+# 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
+ odbc? ( dev-db/unixODBC )
+ sdl? ( media-libs/libsdl )
+ X? (
+ dev-libs/glib:2
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/jpeg:0=
+ x11-libs/gtk+:2
+ x11-libs/libSM
+ x11-libs/libXinerama
+ x11-libs/libXxf86vm
+ x11-libs/pango[X]
+ gnome? ( gnome-base/libgnomeprintui:2.2 )
+ gstreamer? (
+ gnome-base/gconf:2
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10 )
+ opengl? ( virtual/opengl )
+ tiff? ( media-libs/tiff:0 )
+ )
+ aqua? (
+ x11-libs/gtk+:2[aqua=]
+ virtual/jpeg:0=
+ tiff? ( media-libs/tiff:0 )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ opengl? ( virtual/glu )
+ X? (
+ x11-proto/xproto
+ x11-proto/xineramaproto
+ x11-proto/xf86vidmodeproto
+ )"
+
+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
+
+ # x32 https://bugs.gentoo.org/421851
+ sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
+
+ # 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
+}
+
+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
+
+ mkdir "${S}"/wxgtk_build
+ cd "${S}"/wxgtk_build
+
+ ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+ cd "${S}"/wxgtk_build
+
+ emake
+
+ if [[ -d contrib/src ]]; then
+ cd contrib/src
+ emake
+ fi
+}
+
+src_install() {
+ cd "${S}"/wxgtk_build
+
+ emake DESTDIR="${D}" install
+
+ if [[ -d contrib/src ]]; then
+ cd contrib/src
+ emake DESTDIR="${D}" install
+ fi
+
+ cd "${S}"/docs
+ 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
+ dohtml -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-2.8.12.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
new file mode 100644
index 000000000000..3f56f877fe18
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2017 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="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
+# 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-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+ x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+ )
+"
+
+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.2.0-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
new file mode 100644
index 000000000000..21ee7e0f2d62
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# 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
+ doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="alpha amd64 arm 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 webkit"
+
+SLOT="3.0"
+
+RDEPEND="
+ dev-libs/expat
+ sdl? ( media-libs/libsdl )
+ X? (
+ >=dev-libs/glib-2.22:2
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/jpeg:0=
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/gdk-pixbuf
+ x11-libs/libSM
+ x11-libs/libXxf86vm
+ x11-libs/pango[X]
+ gstreamer? (
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10 )
+ libnotify? ( x11-libs/libnotify )
+ opengl? ( virtual/opengl )
+ tiff? ( media-libs/tiff:0 )
+ webkit? ( net-libs/webkit-gtk:2 )
+ )
+ aqua? (
+ x11-libs/gtk+:2[aqua=]
+ virtual/jpeg:0=
+ tiff? ( media-libs/tiff:0 )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ opengl? ( virtual/glu )
+ X? (
+ x11-proto/xproto
+ x11-proto/xineramaproto
+ x11-proto/xf86vidmodeproto
+ )"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+
+ # https://bugs.gentoo.org/421851
+ # https://bugs.gentoo.org/499984
+ # https://bugs.gentoo.org/536004
+ sed \
+ -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \
+ -e 's:3\.0\.1:3.0.2:g' \
+ -e 's:^wx_release_number=1$:wx_release_number=2:' \
+ -i configure || die
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf
+
+ # X independent options
+ myconf="
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat28
+ $(use_with sdl)"
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug \
+ && myconf="${myconf} --enable-debug=max"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --with-gtkprint
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(use_enable webkit webview)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)"
+
+ 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
+
+ mkdir "${S}"/wxgtk_build
+ cd "${S}"/wxgtk_build
+
+ ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+ cd "${S}"/wxgtk_build
+ emake
+}
+
+src_install() {
+ cd "${S}"/wxgtk_build
+
+ emake DESTDIR="${D}" install
+
+ cd "${S}"/docs
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dohtml -r "${S}"/docs/doxygen/out/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.2.0-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
new file mode 100644
index 000000000000..b77e2b3dd25f
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# 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
+ doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="alpha amd64 arm 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 webkit"
+
+SLOT="3.0"
+
+RDEPEND="
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
+ X? (
+ >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/jpeg:0=[${MULTILIB_USEDEP}]
+ >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ x11-libs/pango[X,${MULTILIB_USEDEP}]
+ gstreamer? (
+ media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+ libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+ opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ webkit? ( net-libs/webkit-gtk:2 )
+ )
+ 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-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+ x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+ )"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+ epatch_user
+
+ # https://bugs.gentoo.org/536004
+ sed \
+ -e 's:3\.0\.1:3.0.2:g' \
+ -e 's:^wx_release_number=1$:wx_release_number=2:' \
+ -i "${S}"/configure || die
+
+}
+
+multilib_src_configure() {
+ local myconf
+
+ # X independent options
+ myconf="
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat28
+ $(use_with sdl)"
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug \
+ && myconf="${myconf} --enable-debug=max"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --with-gtkprint
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(multilib_native_use_enable webkit webview)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)"
+
+ 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_install_all() {
+ cd "${S}"/docs || die
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dodoc -r "${S}"/docs/doxygen/out/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.2.0-r3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild
new file mode 100644
index 000000000000..9bb65a6e57f9
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# 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
+ doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.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"
+IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
+
+SLOT="3.0"
+
+RDEPEND="
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
+ X? (
+ >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/jpeg:0=[${MULTILIB_USEDEP}]
+ >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ x11-libs/pango[${MULTILIB_USEDEP}]
+ gstreamer? (
+ media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+ libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+ opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ webkit? ( net-libs/webkit-gtk:2 )
+ )
+ 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-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+ x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+ )"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+ epatch "${FILESDIR}"/${P}-webview-fixes.patch
+ epatch "${FILESDIR}"/${P}-gcc6.patch
+ epatch_user
+
+ for f in $(find "${S}" -name configure.in); do
+ mv "${f}" "${f/in/ac}" || die
+ done
+ AT_M4DIR="${S}/build/aclocal" eautoreconf
+
+ # https://bugs.gentoo.org/536004
+ sed \
+ -e 's:3\.0\.1:3.0.2:g' \
+ -e 's:^wx_release_number=1$:wx_release_number=2:' \
+ -i "${S}"/configure || die
+
+}
+
+multilib_src_configure() {
+ local myconf
+
+ # X independent options
+ myconf="
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat28
+ $(use_with sdl)"
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug \
+ && myconf="${myconf} --enable-debug=max"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --with-gtkprint
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(multilib_native_use_enable webkit webview)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)"
+
+ 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_install_all() {
+ cd "${S}"/docs || die
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dodoc -r "${S}"/docs/doxygen/out/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.2.0-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild
new file mode 100644
index 000000000000..0266dca9e66d
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r300.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# 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
+ doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~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 webkit"
+
+WXSUBVERSION=${PV}-gtk3 # 3.0.2.0-gtk3
+WXVERSION=${WXSUBVERSION%.*} # 3.0.2
+WXRELEASE=${WXVERSION%.*}-gtk3 # 3.0-gtk3
+WXRELEASE_NODOT=${WXRELEASE//./} # 30-gtk3
+
+SLOT="${WXRELEASE}"
+
+RDEPEND="
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
+ X? (
+ >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/jpeg:0=[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ x11-libs/pango[X,${MULTILIB_USEDEP}]
+ gstreamer? (
+ media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+ libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+ opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ webkit? ( net-libs/webkit-gtk:2 )
+ )
+ aqua? (
+ x11-libs/gtk+:3[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-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+ x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+ )"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+ # Versionating
+ sed -i \
+ -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
+ -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
+ -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
+ -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
+ -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}:" \
+ -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}:" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
+ utils/wxrc/Makefile.in || die
+
+ sed -i \
+ -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
+ -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
+ -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
+ -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
+ configure || die
+
+ default
+}
+
+multilib_src_configure() {
+ local myconf
+
+ # X independent options
+ myconf="
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat28
+ $(use_with sdl)"
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug \
+ && myconf="${myconf} --enable-debug=max"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --with-gtkprint
+ --enable-gui
+ --with-gtk=3
+ --with-libpng=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(multilib_native_use_enable webkit webview)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)"
+
+ 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_install_all() {
+ cd "${S}"/docs || die
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dodoc -r "${S}"/docs/doxygen/out/html
+ fi
+
+ # Unversioned links
+ rm "${D}"/usr/bin/wx{-config,rc}
+
+ # version bakefile presets
+ pushd "${D}"usr/share/bakefile/presets/ > /dev/null
+ for f in wx*; do
+ mv "${f}" "${f/wx/wx30gtk3}"
+ done
+ popd > /dev/null
+}
+
+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.2.0-r301.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
new file mode 100644
index 000000000000..61856901093a
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# 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
+ doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~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 webkit"
+
+WXSUBVERSION=${PV}-gtk3 # 3.0.2.0-gtk3
+WXVERSION=${WXSUBVERSION%.*} # 3.0.2
+WXRELEASE=${WXVERSION%.*}-gtk3 # 3.0-gtk3
+WXRELEASE_NODOT=${WXRELEASE//./} # 30-gtk3
+
+SLOT="${WXRELEASE}"
+
+RDEPEND="
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
+ X? (
+ >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/jpeg:0=[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ x11-libs/pango[${MULTILIB_USEDEP}]
+ gstreamer? (
+ media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+ libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+ opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ webkit? ( net-libs/webkit-gtk:3 )
+ )
+ aqua? (
+ x11-libs/gtk+:3[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-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+ x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+ )"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+PATCHES=(
+ "${FILESDIR}"/${P}-webview-fixes.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+ default
+
+ local f
+ for f in $(find "${S}" -name configure.in); do
+ mv "${f}" "${f/in/ac}" || die
+ done
+ AT_M4DIR="${S}/build/aclocal" eautoreconf
+
+ # Versionating
+ sed -i \
+ -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
+ -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
+ -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
+ -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
+ -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}:" \
+ -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}:" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
+ utils/wxrc/Makefile.in || die
+
+ sed -i \
+ -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
+ -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
+ -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
+ -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
+ configure || die
+}
+
+multilib_src_configure() {
+ local myconf
+
+ # X independent options
+ myconf="
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat28
+ $(use_with sdl)"
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug \
+ && myconf="${myconf} --enable-debug=max"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --with-gtkprint
+ --enable-gui
+ --with-gtk=3
+ --with-libpng=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(multilib_native_use_enable webkit webview)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)"
+
+ 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_install_all() {
+ cd "${S}"/docs || die
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dodoc -r "${S}"/docs/doxygen/out/html
+ fi
+
+ # Unversioned links
+ rm "${D}"/usr/bin/wx{-config,rc}
+
+ # version bakefile presets
+ pushd "${D}"usr/share/bakefile/presets/ > /dev/null
+ for f in wx*; do
+ mv "${f}" "${f/wx/wx30gtk3}"
+ done
+ popd > /dev/null
+}
+
+pkg_postinst() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
+
+pkg_postrm() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 23:58:27 +0000