Version bump (bug #485184).

Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

4 files changed, 260 insertions, 10 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 6320303261f5..b60d9e71da4a 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.301 2013/10/06 09:04:16 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.302 2013/12/30 09:26:18 dirtyepic Exp $
+
+*wxGTK-3.0.0.0 (30 Dec 2013)
+
+  30 Dec 2013; Ryan Hill <dirtyepic@gentoo.org> +wxGTK-3.0.0.0.ebuild,
+  +files/wxGTK-3.0.0.0-collision.patch:
+  Version bump (bug #485184).
 
   06 Oct 2013; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.8.12.1.ebuild:
   Drop to ~sh.
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 15e3833758db..c204213cd4ed 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -7,28 +7,32 @@ AUX wxGTK-2.8.11-unicode-odbc.patch 624 SHA256 2e2cbeb2240770497611bf845127f737e
 AUX wxGTK-2.8.7-mmedia.patch 585 SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85 SHA512 b17b49f0c61d3b6f36dfc6835d4e116c9b4e5da79cc7940384313b6f541a389cc82a3d0dd807b45a9ec427601390162fbac0ba5cbcff6a5f8f05987fc8947de9 WHIRLPOOL 362503988879cc536671788df023339b5cf10bbda48cf4af957c12d2dcd232772235ec0c461d26a83b1b4243a8023bf3cee32d9486027373f8e9dbda44271c02
 AUX wxGTK-2.9.3.1-collision.patch 6082 SHA256 a98df8ef1266c52ab72a9b03aeddda8c1d8a7c79287e0fd71cd7fec7fcb2bb88 SHA512 320886e56f4e98fe487c3f39570321663a1fe96d48e29f2c43a131be8a3e0f7bb5d5c315772bad1269a5a70cdcaabd1e4f87c28e2cbc7123ab787fd57bbe221d WHIRLPOOL 5dfc5fb13271a739c59e2261a50d8c82f451749993bc01b502dfee087f96b358cb81c13bd852139d6983001a44f18b916c193a8e2e8168132003898427aa3b6d
 AUX wxGTK-2.9.4.1-collision.patch 6099 SHA256 bdef409ca229c6c28f65fbd6a177a55aeaddd580d628721fcd4a5f9f756fe7b4 SHA512 5f8f67129d75b9c2e5f22e671300e7bfa5a65b19216ce81def7cc64ebc9af64685532abefda956eee2005b159aeb163103490d60893032ea428bca6ce4a4161e WHIRLPOOL a8586438764b6595331356475d91bb67406e2d633ca86a910c0b15b176513bad22a9cfdd94ef8a0e167acba8563f59e8f72f15c85090ec485d79ac44d0de731d
+AUX wxGTK-3.0.0.0-collision.patch 6235 SHA256 ec7d88fed44fac6916d631329b0950e82a7c646ac35fa495de1c691ef52c1d58 SHA512 d2fb995860bd65a8dfc10aa520ab35abf073dc2f10d6ecf8b778620814ff8839aab193038fc63d303f3378bf9ecf9a45da2a5e4034ed3479eb93ec1454f3dc02 WHIRLPOOL a9c54029b949fe4ecf97c2ad6ad4dad8be3600cf1b8d0dd91f0d11dbea22674c81486fac28c28c882fe76dac93f72da033ea19d3fa88afe9137f87bac5eb2943
 DIST wxPython-docs-2.9.3.1.tar.bz2 14913825 SHA256 64c6b07c8fa0277b281fb1e6210087e57fb072ce8cabe86d251c3208040cd945 SHA512 23d39a28532d686b06f410596f108a97b377e0250f2ae90b681053197c7e0bcbb98374aaeea0d343359b28ebff482d668de5b7a3d07362cc8e35c61a7d50cbb6 WHIRLPOOL 43ba589c44c70b9423639e2535e30d4a1ea0ad729964abcc48c92ae59929a9e95ea02dfd704b87b16adddb9327916832d24fe516c8a4780362a1bca718742bcd
 DIST wxPython-docs-2.9.4.0.tar.bz2 15477636 SHA256 42a1683f253aa36ae9ee20b8d511d8704b4e45ba124fec256a7dfce38da9f75f SHA512 f996e69f24baaa8d35bf94ef77f31f6beda5dd4ddd65d6b71558e8dbe33098c951f995172b4ccd93ad08c81df07a9b529813eac5d39ffa06290f2a9ccc87620c WHIRLPOOL b6f6d65d319683f44b1eb4708077abaecd1a972a0d79fb6293b055099a0720d36e83506df6d075243f9e8b180849ae0d44badc8a22d5c764c956d5ecfe0cc6da
+DIST wxPython-docs-3.0.0.0.tar.bz2 21411087 SHA256 4bb98d37ac9fc68a1cbde45efa03f06c4bd167719249d1cba15ac8a6f8e2dcb8 SHA512 30d680edeb88f5cea096cfeb4324ee554aff4bab233557c1155b81b08baea60601d6f8499f03dd603111a181003e00581686ce45a187cbf608eb003388eaf193 WHIRLPOOL 5db92780fc3815333d68a70b66032356dac5f248e9afa948b27ece6bc8bc8794ae877477bf92f0c38ea0875ec99a7db98211d820bc7226db961a0516b0de1b86
 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
 DIST wxPython-src-2.9.3.1.tar.bz2 49131100 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d SHA512 16e5be3a2a98d64637866ecae7afb3a2835d21684077bb8a1b87d3c0cf37b75eb1169f3b8e16e38c5b85c04cce974dbfd5ba25d3d0a3016a47c005a05e5dbfc5 WHIRLPOOL ccae768ff87a95ee88d6259821be5e2073928278155743c0c16c75dd9b2262ac49ccb322dd4aa77ccfdac12d7de0e874a92b41171adacfa26ffb216f170751a7
 DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
 DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
+DIST wxPython-src-3.0.0.0.tar.bz2 57831792 SHA256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 SHA512 9328f46817e0c1670a6be5d10347c8a7110c42a5332c5c35eb11ed0412d8dddeb15727d98606bb6c699af961cee171c41b82b1f24f3de25463259106660f7387 WHIRLPOOL 7865997e22db366a41bae8a5d5c47e4f46b20d17871377243abced3a6550c46588ea1d5a426d826ccf011c62898f87d6a55a14ac9b4153af4e0795d5f180a647
 EBUILD wxGTK-2.8.12.1-r1.ebuild 4295 SHA256 8d5e13ac199a327ad4049d39fbe01eca9abb290b229ebe0c0efabd55e9d26bb9 SHA512 948b3601041aa1e96828d9323540390d558ef945d1c7a27b858ebd4d9e3edd9287e5e1179e75ae8656d9a621b01a0812032c38ca84f68b94885a2bea92457337 WHIRLPOOL 080cee6b394c1981dd8a6f1b2e55959b154330bf5b58f6b52f77f57cf29899c264928d5622ce7ed3d6cb53c7421049fccddbae3a6ac9a64aecee126e64982308
 EBUILD wxGTK-2.8.12.1.ebuild 4118 SHA256 41ba79b25a226f6f58fc2b10773140cb0deac3ee5bd33ae2f25f88444da9f65a SHA512 a34933f2f698743012171deba68d514cda0ee5f173c7684d24d31ac78ccaf4847d7602e8df14b0551d1b36f107c859d96a0ff7cda6585fdc37d9338d9a998afd WHIRLPOOL 46ea7ef50e6a24cdb5572eeb038a76580821376eea2365311d1bed72beb5858ed521fed4eea425cb44c0786c3b9ce812dcf3d117ba34ad6604e21563cd57f1c0
 EBUILD wxGTK-2.9.3.1-r1.ebuild 4343 SHA256 8950007d509129e13637e43a1509529cf1dd60ea754d1700121a3f787df74342 SHA512 f049ec56e516b0d7d9fb11352abc67aa50190a875efdd0792501fc0f38ff093f7ccc1fc729dd7703d131027cf3cac9c71c3dea9b16b66b138f84959198edac52 WHIRLPOOL 5f88cf9423ce8c2ebcb2069f9bb908e63ac12b463c1bc749818a0607403b5cd09bbfcd8b0795eaaa86171be02b0adb3b0a283d91616e9910a79550ec558baee6
 EBUILD wxGTK-2.9.3.1.ebuild 4220 SHA256 ff5dff0eebef2475ce2f1ced22bbb3a2a40b401154ed88435762477c913efc99 SHA512 8a4a40913e192437fc249219677aa844e454aefc9f27986152d927ecc0c57456ce091a24939dc4b5381cda7956bcac017f1cfb61193a5dbf52225517e2862147 WHIRLPOOL a162b95fc4196247034a4f0ea45eb2d71fd631b5858321a4ef619e69e3572baac1ae3c1e1e1f3d6b4db871b3ad58b9092aa81e3ec0324f0293582703b4e2f710
 EBUILD wxGTK-2.9.4.1-r1.ebuild 4451 SHA256 0cc04fa5ba5fcc4f04bba0066361662252abd420529b4ad0f441aadf307648a9 SHA512 6aa0e75c2de89748d9da4b0e961142b89c640b8b40d2f88a6f162746f0bdfec56a77b8e60ec6b3efe20bd25840281eabd1e1e167b9e69faab12a944b1a302f7b WHIRLPOOL 90c1e88b6dd54a5059ce4bb642b60af5d34816e844670fd945141439d26bc43f90b04227ac7dd1251dc7ba28ba08cf68047fecf4f0bbec30f66a54f71a9ad8d3
 EBUILD wxGTK-2.9.4.1.ebuild 4281 SHA256 6245bdd415bc6477f414558b2a6ba066b387a30975850b496d1037c50d0a59cb SHA512 116b7544587ff15dea61f91ad6f23b490e634652c0ed59cb874c113a712757fa0f47d1cd1a4cb7b0527944c55e8a48a16c05c8ba63efe66e64b10f69a674e4fd WHIRLPOOL 51bd6c735a49d0b4f6324c6fffef1d900b140f13d4867dbc12eff8718a3be125cc77a0dc705e6da03b6c40c07cff9fbe42351742b15fa8ca7939f838c8565446
-MISC ChangeLog 47434 SHA256 e47098684dea4902fd29833bbe313bd52a4ebd9769a18cdacd8d0f0d57c4acc8 SHA512 0fe3c5b377b8617bd2b4c2fe2d6bf7f2dbddea56e96c848e2ec3a9cf2f9ee1a31f41de42ee3aea56aed966685952938f233a7878337b7dacdeafd6a6e85ee01f WHIRLPOOL a7c80a6241eba496d81d2e81fdec35416c0240fe5a61ca42f9a2f1652ed05e4ef56ed0278cc4fae71efb0bddcd916030c380af88d5e8bf1c0d7f740a9a1f0d77
+EBUILD wxGTK-3.0.0.0.ebuild 3961 SHA256 f238dd53f79c89889a3f1bfdefc9874e498455baa5f1e94730a63356c51a0e6a SHA512 c314ab9e14b1db1e3d4bda591942878a354e8d2fb55cf2a6ccf37112753e64531b2cf796c20c3870a0c0d3936c4eea07b96966b04536fa1c917cba0dcccf8209 WHIRLPOOL 222eb298f9b62d054edbc3a8f0886ced3bb491d715b0f64d9f00ab6bb076032cc06c3006f1167b1c610758f2d398767c3c1cf16aab3328318839f5c107091030
+MISC ChangeLog 47606 SHA256 0cec027915bc7660aa98b104f68593e851d8da6731a267515af17af7f05c0a3b SHA512 6280a99f84f91740ffe71b4fb0337c5271783a8c593bdd9c758d2b1e3296f93c87207eb2e93c9a713f21c742b054978890e1d90cfb853d6adeb8ddae49ff1f99 WHIRLPOOL 6f495e2eb5c690b66651de44a119ea9f92fde133e71af19d2e2ec6c9899ab2fbe41f81c165b01fa0cce6462085a57b0551762012e947903bd85d32559a83b7de
 MISC metadata.xml 670 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75 SHA512 37ec56d00b488857a285a61c894f8c28dde61efce48d79b7767a207f5c533ad01f2ef09ebecc98dd5b803b4545e1d7f513ffb48e5ead4818ecb607129339c907 WHIRLPOOL cbcc9d2aea988f0b8e1a0615918903cf332976b192156296051c9f5ac5563e9ab512376453a52ad02db0fe3465b9b30d88d6808e38bea52bb58abe6fed316586
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSUSoBAAoJEO04vUmVeoRj6TsH/jcbOfhb5QHDSpQ8qziW0XHH
-nfImX6uCCrskbJ3W46wt2pe/IehchD+ddqPmEXWHcUkiWRj+jzSdJM+ENcLosOug
-X0b+0ExGaDEu31f7F/DbZWQ4gv3P+XK7wgLOcvBkY9XyyWrhUCINEiq/dT3C9FX5
-NL8/vY8v7Dzer/hOpeQsfEmpNBzH8kwaXqOsMT9ls6iECLN/ax1RCpda8lgmzexV
-pZY+jzg4XeCGYXVc5QKElXY46klpbhfPm7kl/At8jCXTnJxW3HsL2NvLBwEgHK/b
-FVOJryGZ8o2DCSaofVcB/RcL7dmfizQZbwrua+Yqw7iXhktt6PgNhrkzhPvloiA=
-=OiuF
+iQEcBAEBCAAGBQJSwT6BAAoJEO04vUmVeoRjdjEIAMBwGWuf0uemWD4lPjusH9Hn
+kOoUQ1suofmQieqGLZy036JjezkgnmYzBAt3xWUMN/fVc7c22VMa3U3E3r1elu1T
+2QDZaR+sUFfpzdlqvrkfZLxXAnEi5XVKURVEpMydilpWcKRjiZYOL9fmk69WXT0+
+JfvAahgjQ+K5XGGJep9bAKdQobCY8InEQgp5q3/nxqs2CO0ykHpx+Re24xXlLu5p
+mvV187f7cpa0qsvFyQ3yLKjUnEjoqfbUKVRinjGgg6t9vwwChjHnCpyWY4ekF++z
+KVrPagC2HUCyEBAhkWZVkW9nRz/odu8iYdZFqnH1Z6IADH63Sm4sQ4+are8uy34=
+=v1pu
 -----END PGP SIGNATURE-----
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..8d508fb3b0de
--- /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-admin/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/wxGTK-3.0.0.0.ebuild b/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild
new file mode 100644
index 000000000000..c3870270ac81
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild,v 1.1 2013/12/30 09:26:18 dirtyepic Exp $
+
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gnome gstreamer 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
+		>=x11-libs/gtk+-2.18: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 )
+		webkit? ( net-libs/webkit-gtk:2 )
+		)
+	aqua? (
+		>=x11-libs/gtk+-2.4[aqua=]
+		virtual/jpeg
+		tiff?   ( media-libs/tiff:0 )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	opengl? ( virtual/glu )
+	X?  (
+		x11-proto/xproto
+		x11-proto/xineramaproto
+		x11-proto/xf86vidmodeproto
+		)"
+
+PDEPEND=">=app-admin/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-collision.patch
+	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
+	# http://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
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--without-gnomevfs
+			$(use_enable gstreamer mediactrl)
+			$(use_enable webkit webview)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			$(use_with !gnome gtkprint)
+			$(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-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}