[gentoo-commits] proj/gamerlay:master commit in: x11-libs/wxGTK/, games-emulation/ps2emu-gsdx/, games-emulation/pcsx2-meta/, ...

[Marcel Unbehaun]

commit:     a084a58014f11d0addb2242aeb4bd4e9a942436f
Author:     frostwork <frostwork1 <AT> gmail <DOT> com>
AuthorDate: Sun Jun 22 05:51:39 2014 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Sun Jun 22 05:51:39 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=a084a580

updated modular pcsx2 live ebuilds and added slightly modified multilib wxGTK ebuild from 510708

---
 games-emulation/pcsx2-meta/pcsx2-meta-9999.ebuild  |    9 +-
 games-emulation/pcsx2/pcsx2-9999.ebuild            |   86 +-
 .../ps2emu-cdvdiso/ps2emu-cdvdiso-9999.ebuild      |   32 +-
 .../ps2emu-cdvdlinuz/ps2emu-cdvdlinuz-9999.ebuild  |   23 +-
 .../ps2emu-cdvdnull/ps2emu-cdvdnull-9999.ebuild    |   23 +-
 .../ps2emu-dev9null/ps2emu-dev9null-9999.ebuild    |   23 +-
 .../ps2emu-fwnull/ps2emu-fwnull-9999.ebuild        |   23 +-
 games-emulation/ps2emu-gsdx/files/mesa-10.patch    |   13 +
 .../ps2emu-gsdx/ps2emu-gsdx-9999.ebuild            |   43 +-
 .../ps2emu-gsnull/ps2emu-gsnull-9999.ebuild        |   23 +-
 .../ps2emu-onepad/ps2emu-onepad-9999.ebuild        |   23 +-
 .../ps2emu-padnull/ps2emu-padnull-9999.ebuild      |   23 +-
 .../ps2emu-spu2-x/ps2emu-spu2-x-9999.ebuild        |   47 +-
 .../ps2emu-spu2null/ps2emu-spu2null-9999.ebuild    |   23 +-
 .../ps2emu-usbnull/ps2emu-usbnull-9999.ebuild      |   23 +-
 .../ps2emu-zerogs/ps2emu-zerogs-9999.ebuild        |   33 +-
 .../ps2emu-zzogl/ps2emu-zzogl-9999.ebuild          |   30 +-
 x11-libs/wxGTK/ChangeLog                           | 1321 ++++++++++++++++++++
 .../wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch  |   39 +
 x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch  |   74 ++
 .../wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch    |   13 +
 x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch      |   11 +
 x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch |   77 ++
 x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch |   75 ++
 x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch |   75 ++
 x11-libs/wxGTK/metadata.xml                        |   22 +
 x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild            |  187 +++
 x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild                |  170 +++
 28 files changed, 2242 insertions(+), 322 deletions(-)

diff --git a/games-emulation/pcsx2-meta/pcsx2-meta-9999.ebuild b/games-emulation/pcsx2-meta/pcsx2-meta-9999.ebuild
index a8ba0df..2432e3d 100644
--- a/games-emulation/pcsx2-meta/pcsx2-meta-9999.ebuild
+++ b/games-emulation/pcsx2-meta/pcsx2-meta-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/pcsx2-meta-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
 EAPI="2"
 
@@ -12,8 +12,8 @@ SRC_URI=""
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="cdvdiso cdvdlinuz cdvdnull dev9null fwnull gsdx gsnull onepad padnull spu2null spu2-x usbnull zerogs zerospu zzogl"
+KEYWORDS=""
+IUSE="cdvdiso cdvdlinuz cdvdnull dev9null fwnull gsdx gsnull onepad padnull spu2null spu2-x usbnull zerogs zzogl"
 
 RDEPEND=" games-emulation/pcsx2
 	cdvdiso?	( games-emulation/ps2emu-cdvdiso )
@@ -29,6 +29,5 @@ RDEPEND=" games-emulation/pcsx2
 	spu2-x?		( games-emulation/ps2emu-spu2-x )
 	usbnull?	( games-emulation/ps2emu-usbnull )
 	zerogs?		( games-emulation/ps2emu-zerogs )
-	zerospu?	( games-emulation/ps2emu-zerospu )
 	zzogl?		( games-emulation/ps2emu-zzogl )
 	"

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f2b8462..8a6c1e3 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,60 +1,43 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/pcsx2-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion wxwidgets
+inherit games cmake-utils git-2 wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="debug"
+RDEPEND="
+		app-arch/bzip2[abi_x86_32]
+		dev-libs/libaio[abi_x86_32]
+		sys-libs/zlib[abi_x86_32]
+		media-libs/alsa-lib[abi_x86_32]
+		media-libs/glew[abi_x86_32]
+		media-libs/libsdl[abi_x86_32]
+		media-libs/portaudio[abi_x86_32]
+		virtual/jpeg:62[abi_x86_32]
+		virtual/opengl[abi_x86_32]
+		x11-libs/gtk+:2[abi_x86_32]
+		x11-libs/libICE[abi_x86_32]
+		x11-libs/libX11[abi_x86_32]
+		x11-libs/libXext[abi_x86_32]
+		x11-libs/wxGTK:2.8[X,abi_x86_32]
+		x86? ( media-gfx/nvidia-cg-toolkit )
+		amd64? ( media-gfx/nvidia-cg-toolkit[multilib]	)
+"
 
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
-
-DEPEND="dev-cpp/sparsehash
-	x86? (
-		app-arch/bzip2
-		sys-libs/zlib
-		media-libs/alsa-lib
-		media-libs/glew
-		media-libs/libsdl
-		media-libs/portaudio
-		media-gfx/nvidia-cg-toolkit
-		virtual/jpeg
-		virtual/opengl
-		x11-libs/gtk+:2
-		x11-libs/libICE
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/wxGTK[X]
-	)
-	amd64? ( media-gfx/nvidia-cg-toolkit[multilib]
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-opengl
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-gtklibs
-		app-emulation/emul-linux-x86-sdl
-		app-emulation/emul-linux-x86-soundlibs
-		app-emulation/emul-linux-x86-wxGTK
-	)"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	>=dev-cpp/sparsehash-1.5
+"
 
 src_prepare() {
 	sed -i -e "s:CDVDnull TRUE:CDVDnull FALSE:g" -i cmake/SelectPcsx2Plugins.cmake
@@ -76,16 +59,19 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
+	
 	wxgtk_config=""
 	cg_config=""
 	if use amd64; then
 		# tell cmake to use 32 bit library
-		wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-32"
+		wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-x86"
 		cg_config="-DCG_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCg.so
 					-DCG_GL_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCgGL.so"
 	fi
 
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/${PN}
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/${PN}
@@ -106,15 +92,3 @@ src_install() {
 
 	prepgamesdirs
 }
-
-pkg_postinst() {
-	if use amd64; then
-		einfo "We currently use 64bit dev-cpp/sparsehash for compiling pcsx2"
-		einfo "since sparsehash installation contains only header files."
-		einfo "If you encounter any problems with that, try"
-		einfo ""
-		einfo "    ABI=\"x86\" emerge sparsehash"
-		einfo ""
-		einfo "and remerge pcsx2 before reporting bugs."
-	fi
-}

diff --git a/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-9999.ebuild b/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-9999.ebuild
index 530e506..376fbd6 100644
--- a/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-9999.ebuild
+++ b/games-emulation/ps2emu-cdvdiso/ps2emu-cdvdiso-9999.ebuild
@@ -1,42 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-cdvdiso-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="cdvdiso plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
-DEPEND="
-	x86? (
-		app-arch/bzip2
-		x11-libs/gtk+:2
-	)
-	amd64? ( app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-gtklibs
-	)"
+DEPEND="app-arch/bzip2[abi_x86_32]"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -62,7 +46,9 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2		

diff --git a/games-emulation/ps2emu-cdvdlinuz/ps2emu-cdvdlinuz-9999.ebuild b/games-emulation/ps2emu-cdvdlinuz/ps2emu-cdvdlinuz-9999.ebuild
index 1928fac..5e7eddb 100644
--- a/games-emulation/ps2emu-cdvdlinuz/ps2emu-cdvdlinuz-9999.ebuild
+++ b/games-emulation/ps2emu-cdvdlinuz/ps2emu-cdvdlinuz-9999.ebuild
@@ -1,35 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-cdvdlinuz-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="cdvdlinux plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -55,7 +46,9 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2		

diff --git a/games-emulation/ps2emu-cdvdnull/ps2emu-cdvdnull-9999.ebuild b/games-emulation/ps2emu-cdvdnull/ps2emu-cdvdnull-9999.ebuild
index 0498e5f..7c60aef 100644
--- a/games-emulation/ps2emu-cdvdnull/ps2emu-cdvdnull-9999.ebuild
+++ b/games-emulation/ps2emu-cdvdnull/ps2emu-cdvdnull-9999.ebuild
@@ -1,33 +1,24 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-cdvdnull-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="cddvd null plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -53,7 +44,9 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2

diff --git a/games-emulation/ps2emu-dev9null/ps2emu-dev9null-9999.ebuild b/games-emulation/ps2emu-dev9null/ps2emu-dev9null-9999.ebuild
index a244162..d011bc0 100644
--- a/games-emulation/ps2emu-dev9null/ps2emu-dev9null-9999.ebuild
+++ b/games-emulation/ps2emu-dev9null/ps2emu-dev9null-9999.ebuild
@@ -1,35 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-dev9null-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="dev9null plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -55,7 +46,9 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2		

diff --git a/games-emulation/ps2emu-fwnull/ps2emu-fwnull-9999.ebuild b/games-emulation/ps2emu-fwnull/ps2emu-fwnull-9999.ebuild
index 9c77472..b792a66 100644
--- a/games-emulation/ps2emu-fwnull/ps2emu-fwnull-9999.ebuild
+++ b/games-emulation/ps2emu-fwnull/ps2emu-fwnull-9999.ebuild
@@ -1,35 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-fwnull-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=4
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="fwnull plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -55,7 +46,9 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2

diff --git a/games-emulation/ps2emu-gsdx/files/mesa-10.patch b/games-emulation/ps2emu-gsdx/files/mesa-10.patch
new file mode 100644
index 0000000..597a7a8
--- /dev/null
+++ b/games-emulation/ps2emu-gsdx/files/mesa-10.patch
@@ -0,0 +1,13 @@
+diff -ur ./pcsx2-1.2.2/plugins/GSdx/stdafx.h ./pcsx2-1.2.2-r1/plugins/GSdx/stdafx.h
+--- ./pcsx2-1.2.2/plugins/GSdx/stdafx.h	2014-02-10 22:57:09.000000000 +0400
++++ ./pcsx2-1.2.2-r1/plugins/GSdx/stdafx.h	2014-05-19 00:53:09.835978801 +0400
+@@ -195,6 +195,9 @@
+ 	// Note use GL/glcorearb.h on the future
+ 	#include <GL/gl.h>
+ 	#include <GL/glext.h>
++        #ifndef PFNGLBLENDCOLORPROC
++              typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
++        #endif
+ #endif
+ 	#include "GLLoader.h"
+ 

diff --git a/games-emulation/ps2emu-gsdx/ps2emu-gsdx-9999.ebuild b/games-emulation/ps2emu-gsdx/ps2emu-gsdx-9999.ebuild
index e3d23c2..bd57468 100644
--- a/games-emulation/ps2emu-gsdx/ps2emu-gsdx-9999.ebuild
+++ b/games-emulation/ps2emu-gsdx/ps2emu-gsdx-9999.ebuild
@@ -1,45 +1,36 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-gsdx-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="gsdx plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
-DEPEND="
-	x86? (
-		virtual/opengl
+DEPEND="virtual/opengl
 		x11-libs/libX11
-		x11-libs/libXext
-
-	)
-	amd64? ( app-emulation/emul-linux-x86-opengl
-		app-emulation/emul-linux-x86-xlibs
-
-	)"
+		x11-libs/libXext"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	# Workaround broken glext.h, bug #510730
+	"${FILESDIR}"/mesa-10.patch
+)
+
 src_prepare() {
+	epatch "${FILESDIR}"/mesa-10.patch
+
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(SoundTouch)::g" -i 3rdparty/CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -65,7 +56,9 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2

diff --git a/games-emulation/ps2emu-gsnull/ps2emu-gsnull-9999.ebuild b/games-emulation/ps2emu-gsnull/ps2emu-gsnull-9999.ebuild
index 5862ffc..f85973c 100644
--- a/games-emulation/ps2emu-gsnull/ps2emu-gsnull-9999.ebuild
+++ b/games-emulation/ps2emu-gsnull/ps2emu-gsnull-9999.ebuild
@@ -1,35 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-gsnull-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="gsnull plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -55,7 +46,9 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2

diff --git a/games-emulation/ps2emu-onepad/ps2emu-onepad-9999.ebuild b/games-emulation/ps2emu-onepad/ps2emu-onepad-9999.ebuild
index ca0812e..0fdd588 100644
--- a/games-emulation/ps2emu-onepad/ps2emu-onepad-9999.ebuild
+++ b/games-emulation/ps2emu-onepad/ps2emu-onepad-9999.ebuild
@@ -1,30 +1,20 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-onepad-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="onepad plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
 DEPEND="
 	x86? ( media-libs/libsdl )
@@ -32,6 +22,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -57,7 +48,9 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2

diff --git a/games-emulation/ps2emu-padnull/ps2emu-padnull-9999.ebuild b/games-emulation/ps2emu-padnull/ps2emu-padnull-9999.ebuild
index ca77bae..381f1c3 100644
--- a/games-emulation/ps2emu-padnull/ps2emu-padnull-9999.ebuild
+++ b/games-emulation/ps2emu-padnull/ps2emu-padnull-9999.ebuild
@@ -1,35 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-padnull-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="gsnull plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -55,7 +46,9 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2

diff --git a/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-9999.ebuild b/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-9999.ebuild
index 8ad3d8c..b094cb4 100644
--- a/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-9999.ebuild
+++ b/games-emulation/ps2emu-spu2-x/ps2emu-spu2-x-9999.ebuild
@@ -1,38 +1,23 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-spu2-x-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-# no need for amd64 as we will use precompiled wxGTK.
-if use x86; then
-	inherit wxwidgets
-fi
-
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2 wxwidgets
 
 DESCRIPTION="SPU2-x plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug soundtouch"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
+IUSE="soundtouch"
 
 DEPEND="dev-cpp/sparsehash
-	x86? (
 		app-arch/bzip2
 		sys-libs/zlib
 		media-libs/alsa-lib
@@ -47,23 +32,11 @@ DEPEND="dev-cpp/sparsehash
 		x11-libs/libICE
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/wxGTK[X]
-	)
-	amd64? ( media-gfx/nvidia-cg-toolkit[multilib]
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-opengl
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-gtklibs
-		app-emulation/emul-linux-x86-sdl
-		app-emulation/emul-linux-x86-soundlibs
-		app-emulation/emul-linux-x86-wxGTK
-		soundtouch? ( app-emulation/emul-linux-x86-libsoundtouch )
-	)
-
-	"
+		x11-libs/wxGTK:2.8[X]"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	if use soundtouch; then
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	fi
@@ -90,16 +63,18 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	wxgtk_config=""
 	cg_config=""
 	if use amd64; then
 		# tell cmake to use 32 bit library
-		wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-32"
+		wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-x86"
 		cg_config="-DCG_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCg.so
 					-DCG_GL_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCgGL.so"
 	fi
 
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2

diff --git a/games-emulation/ps2emu-spu2null/ps2emu-spu2null-9999.ebuild b/games-emulation/ps2emu-spu2null/ps2emu-spu2null-9999.ebuild
index b0164ea..4033540 100644
--- a/games-emulation/ps2emu-spu2null/ps2emu-spu2null-9999.ebuild
+++ b/games-emulation/ps2emu-spu2null/ps2emu-spu2null-9999.ebuild
@@ -1,35 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-spu2null-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="SPU2null plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -55,7 +46,9 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2

diff --git a/games-emulation/ps2emu-usbnull/ps2emu-usbnull-9999.ebuild b/games-emulation/ps2emu-usbnull/ps2emu-usbnull-9999.ebuild
index 433f8ab..3cd1542 100644
--- a/games-emulation/ps2emu-usbnull/ps2emu-usbnull-9999.ebuild
+++ b/games-emulation/ps2emu-usbnull/ps2emu-usbnull-9999.ebuild
@@ -1,35 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-usbnull-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="usbnull plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -55,7 +46,9 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2

diff --git a/games-emulation/ps2emu-zerogs/ps2emu-zerogs-9999.ebuild b/games-emulation/ps2emu-zerogs/ps2emu-zerogs-9999.ebuild
index 287ca55..0d1afd3 100644
--- a/games-emulation/ps2emu-zerogs/ps2emu-zerogs-9999.ebuild
+++ b/games-emulation/ps2emu-zerogs/ps2emu-zerogs-9999.ebuild
@@ -1,47 +1,32 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-zerogs-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils git-2
 
 DESCRIPTION="zerogs plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
-if use amd64; then
-	ABI="x86"
-fi
-if use debug; then
-	CMAKE_BUILD_TYPE="Debug"
-else
-	CMAKE_BUILD_TYPE="Release"
-fi
 
 DEPEND="dev-cpp/sparsehash
-	x86? (
 		media-libs/glew
 		media-gfx/nvidia-cg-toolkit
 		virtual/opengl
 		x11-libs/libICE
 		x11-libs/libX11
-		x11-libs/libXext
-	)
-	amd64? ( media-gfx/nvidia-cg-toolkit[multilib]
-		app-emulation/emul-linux-x86-opengl
-		app-emulation/emul-linux-x86-xlibs
-	)"
+		x11-libs/libXext"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -i -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -i -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -i -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -69,15 +54,17 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	cg_config=""
 	if use amd64; then
 		# tell cmake to use 32 bit library
-		wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-32"
+		wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-x86"
 		cg_config="-DCG_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCg.so
 					-DCG_GL_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCgGL.so"
 	fi
 
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2		

diff --git a/games-emulation/ps2emu-zzogl/ps2emu-zzogl-9999.ebuild b/games-emulation/ps2emu-zzogl/ps2emu-zzogl-9999.ebuild
index a73fdf0..f83c85f 100644
--- a/games-emulation/ps2emu-zzogl/ps2emu-zzogl-9999.ebuild
+++ b/games-emulation/ps2emu-zzogl/ps2emu-zzogl-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: games-emulation/ps2emu-zzogl-9999.ebuild,v 1.1 2014/06/20 08:30:00 frostwork Exp $
 
-EAPI=3
+EAPI=5
 
 WX_GTK_VER="2.8"
 
-inherit games cmake-utils subversion wxwidgets
+inherit games cmake-utils git-2 wxwidgets
 
 DESCRIPTION="zzogl plugin for pcsx2"
 HOMEPAGE="http://www.pcsx2.net"
-ESVN_REPO_URI="http://pcsx2.googlecode.com/svn/trunk"
-ESVN_PROJECT="pcsx2"
+EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -27,7 +26,6 @@ else
 fi
 
 DEPEND="dev-cpp/sparsehash
-	x86? (
 		app-arch/bzip2
 		sys-libs/zlib
 		media-libs/alsa-lib
@@ -41,20 +39,12 @@ DEPEND="dev-cpp/sparsehash
 		x11-libs/libICE
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/wxGTK[X]
-	)
-	amd64? ( cg? ( media-gfx/nvidia-cg-toolkit[multilib] )
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-opengl
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-gtklibs
-		app-emulation/emul-linux-x86-sdl
-		app-emulation/emul-linux-x86-soundlibs
-		app-emulation/emul-linux-x86-wxGTK
-	)"
+		x11-libs/wxGTK:2.8[X]"
+		
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "s:EXTRA_PLUGINS FALSE:EXTRA_PLUGINS TRUE:g" -i cmake/BuildParameters.cmake
 	sed -e "s:add_subdirectory(3rdparty)::g" -i CMakeLists.txt
 	sed -e "s:INSTALL(FILES:#INSTALL(FILES:g" -i CMakeLists.txt
 	sed -e "s:add_subdirectory(locales)::g" -i CMakeLists.txt
@@ -80,16 +70,18 @@ src_prepare() {
 }
 
 src_configure() {
+	multilib_toolchain_setup x86
 	wxgtk_config=""
 	cg_config=""
 	if use amd64; then
 		# tell cmake to use 32 bit library
-		wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-32"
+		wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-x86"
 		cg_config="-DCG_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCg.so
 					-DCG_GL_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCgGL.so"
 	fi
 
 	mycmakeargs="
+		-DCMAKE_BUILD_TYPE=Release
 		-DPACKAGE_MODE=1
 		-DPLUGIN_DIR=$(games_get_libdir)/pcsx2
 		-DPLUGIN_DIR_COMPILATION=$(games_get_libdir)/pcsx2

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
new file mode 100644
index 0000000..ecef9b6
--- /dev/null
+++ b/x11-libs/wxGTK/ChangeLog
@@ -0,0 +1,1321 @@
+# ChangeLog for x11-libs/wxGTK
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.314 2014/05/23 08:21:26 rhill Exp $
+
+  23 May 2014; Ryan Hill <rhill@g.o> -wxGTK-2.8.12.1.ebuild,
+  wxGTK-2.8.12.1-r1.ebuild, wxGTK-3.0.0.0.ebuild:
+  Restore gconf dep to 2.8 (bug #501672). Apply libpath hack to 3.0.0.0 as
+  well (bug #499984).
+
+  19 Mar 2014; Agostino Sarubbo <ago@g.o> wxGTK-2.8.12.1-r1.ebuild:
+  Stable for alpha, wrt bug #499476
+
+  18 Mar 2014; Agostino Sarubbo <ago@g.o> wxGTK-2.8.12.1-r1.ebuild:
+  Stable for ia64, wrt bug #499476
+
+  14 Mar 2014; Agostino Sarubbo <ago@g.o> wxGTK-2.8.12.1-r1.ebuild:
+  Stable for ppc64, wrt bug #499476
+
+  12 Mar 2014; Agostino Sarubbo <ago@g.o> wxGTK-2.8.12.1-r1.ebuild:
+  Stable for sparc, wrt bug #499476
+
+  23 Feb 2014; Markus Meier <maekke@g.o> wxGTK-2.8.12.1-r1.ebuild:
+  arm stable, bug #499476
+
+  20 Feb 2014; Agostino Sarubbo <ago@g.o> wxGTK-2.8.12.1-r1.ebuild:
+  Stable for x86, wrt bug #499476
+
+  16 Feb 2014; Chema Alonso <nimiux@g.o> wxGTK-2.8.12.1-r1.ebuild:
+  Stable for amd64 wrt bug #499476
+
+  02 Feb 2014; Agostino Sarubbo <ago@g.o> wxGTK-2.8.12.1-r1.ebuild:
+  Stable for ppc, wrt bug #499476
+
+  28 Jan 2014; Jeroen Roovers <jer@g.o> wxGTK-2.8.12.1-r1.ebuild:
+  Stable for HPPA (bug #499476).
+
+  27 Jan 2014; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.12.1.ebuild,
+  wxGTK-2.8.12.1-r1.ebuild, -wxGTK-2.9.3.1.ebuild, -wxGTK-2.9.3.1-r1.ebuild,
+  -wxGTK-2.9.4.1.ebuild, wxGTK-2.9.4.1-r1.ebuild, wxGTK-3.0.0.0.ebuild:
+  Drop unnecessary gconf dep (bug #499416 by Nikoli).
+
+  08 Jan 2014; Ryan Hill <dirtyepic@g.o> wxGTK-3.0.0.0.ebuild:
+  Stop using libgnomeprint (bug #358445) and drop now-unused gnome USE flag.
+  Add missing dependency on libnotify (with USE flag due to hppa). Update other
+  dependencies.
+
+*wxGTK-3.0.0.0 (30 Dec 2013)
+
+  30 Dec 2013; Ryan Hill <dirtyepic@g.o> +wxGTK-3.0.0.0.ebuild,
+  +files/wxGTK-3.0.0.0-collision.patch:
+  Version bump (bug #485184).
+
+  06 Oct 2013; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.12.1.ebuild:
+  Drop to ~sh.
+
+*wxGTK-2.9.4.1-r1 (10 Aug 2013)
+*wxGTK-2.9.3.1-r1 (10 Aug 2013)
+*wxGTK-2.8.12.1-r1 (10 Aug 2013)
+
+  10 Aug 2013; Ryan Hill <dirtyepic@g.o> +wxGTK-2.8.12.1-r1.ebuild,
+  +wxGTK-2.9.3.1-r1.ebuild, +wxGTK-2.9.4.1-r1.ebuild:
+  Port to EAPI 5. Fix x32 build again (bug #421851). Add epatch_user. Restore
+  missing removal of wxmsw.mo to 2.9 ebuilds to prevent file collisions.
+
+  26 Mar 2013; Ryan Hill <dirtyepic@g.o> wxGTK-2.9.3.1.ebuild,
+  wxGTK-2.9.4.1.ebuild:
+  Add webkit USE flag to control building of webview library (bug #462544).
+  Drop cppunit dep since we don't run tests (bug #462876).
+
+  04 Feb 2013; Benda Xu <heroxbd@g.o> wxGTK-2.8.12.1.ebuild:
+  fix Prefix library location in configure. bug 394123
+
+  23 Nov 2012; Rick Farina <zerochaos@g.o> wxGTK-2.8.12.1.ebuild,
+  wxGTK-2.9.3.1.ebuild, wxGTK-2.9.4.1.ebuild:
+  add virtual/glu build time dep per bug #443684 , does not appear to be an rdep
+
+  25 Sep 2012; Mike Frysinger <vapier@g.o> wxGTK-2.8.12.1.ebuild:
+  Fix setup of wx_cv_std_libpath #421851 by Xavier Miller.
+
+  17 Sep 2012; Ryan Hill <dirtyepic@g.o> wxGTK-2.9.3.1.ebuild:
+  SLOT gstreamer deps.
+
+  17 Sep 2012; Ryan Hill <dirtyepic@g.o> +wxGTK-2.9.3.1.ebuild:
+  Restore.
+
+  16 Sep 2012; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.12.1.ebuild,
+  -wxGTK-2.9.3.1.ebuild, wxGTK-2.9.4.1.ebuild:
+  Make gstreamer SLOT explicit. Remove old.
+
+*wxGTK-2.9.4.1 (28 Jul 2012)
+
+  28 Jul 2012; Ryan Hill <dirtyepic@g.o>
+  -files/wxGTK-2.8.11-libpng15.patch, -wxGTK-2.8.11.0.ebuild,
+  -wxGTK-2.8.12.0.ebuild, -wxGTK-2.9.1.1.ebuild,
+  -files/wxGTK-2.9.1.1-collision.patch, +wxGTK-2.9.4.1.ebuild,
+  +files/wxGTK-2.9.4.1-collision.patch:
+  Version bump, remove old.
+
+  31 May 2012; Justin Lecher <jlec@g.o> wxGTK-2.8.12.1.ebuild:
+  Correct searchpath to be sane on prefix without influence on plain
+  installations
+
+  29 May 2012; Alexis Ballier <aballier@g.o> wxGTK-2.8.12.1.ebuild:
+  keyword ~amd64-fbsd
+
+  05 May 2012; Jeff Horelick <jdhore@g.o> wxGTK-2.8.11.0.ebuild,
+  wxGTK-2.8.12.0.ebuild, wxGTK-2.8.12.1.ebuild, wxGTK-2.9.1.1.ebuild,
+  wxGTK-2.9.3.1.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  25 Mar 2012; Raúl Porcel <armin76@g.o> wxGTK-2.8.12.1.ebuild:
+  alpha/ia64/sh/sparc stable wrt #403235
+
+  08 Mar 2012; Brent Baude <ranger@g.o> wxGTK-2.8.12.1.ebuild:
+  Marking wxGTK-2.8.12.1 ppc64 for bug 403235
+
+  28 Feb 2012; Brent Baude <ranger@g.o> wxGTK-2.8.12.1.ebuild:
+  Marking wxGTK-2.8.12.1 ppc for bug 403235
+
+  22 Feb 2012; Jeroen Roovers <jer@g.o> wxGTK-2.8.12.1.ebuild:
+  Stable for HPPA (bug #403235).
+
+  16 Feb 2012; Markus Meier <maekke@g.o> wxGTK-2.8.12.1.ebuild:
+  arm stable, bug #403235
+
+  16 Feb 2012; Pawel Hajdan jr <phajdan.jr@g.o> wxGTK-2.8.12.1.ebuild:
+  x86 stable wrt bug #403235
+
+  13 Feb 2012; Agostino Sarubbo <ago@g.o> wxGTK-2.8.12.1.ebuild:
+  Stable for amd64, wrt bug #403235
+
+*wxGTK-2.9.3.1 (12 Feb 2012)
+
+  12 Feb 2012; Ryan Hill <dirtyepic@g.o> +wxGTK-2.9.3.1.ebuild,
+  +files/wxGTK-2.9.3.1-collision.patch:
+  Version bump (bug #384037 by radhermit).
+
+  09 Dec 2011; Samuli Suominen <ssuominen@g.o>
+  -files/wxGTK-2.6.3-unicode-odbc.patch, -wxGTK-2.6.4.0-r6.ebuild,
+  -files/wxGTK-2.6.4.0-g_free.patch, -files/wxGTK-2.6.4.0-wxrc_link_fix.patch,
+  -files/wxGTK-2.6.4-collision.patch, -files/wxGTK-2.6.4-mmedia.patch,
+  -files/wxGTK-2.8.10.1-CVE-2009-2369.patch,
+  -files/wxGTK-2.8.10.1-gsocket.patch,
+  -files/wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch:
+  old
+
+*wxGTK-2.8.12.1 (09 Dec 2011)
+
+  09 Dec 2011; Ryan Hill <dirtyepic@g.o> +wxGTK-2.8.12.1.ebuild:
+  Version bump.
+
+  09 Dec 2011; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.12.0.ebuild:
+  Prefix should pay more attention when they ignore metadata.xml (bug
+  #384037c12).
+
+  09 Dec 2011; Ryan Hill <dirtyepic@g.o>
+  files/wxGTK-2.8.11-collision.patch:
+  Remove stray DESTDIR from collision patch that created a broken symlink in
+  binpkgs (bug #384725 by Thomas Rausch).
+
+  09 Dec 2011; Ryan Hill <dirtyepic@g.o> -wxGTK-2.8.10.1-r5.ebuild,
+  -files/wxGTK-2.8.10-collision.patch:
+  Remove old.
+
+  12 Nov 2011; Justin Lecher <jlec@g.o> wxGTK-2.6.4.0-r6.ebuild,
+  wxGTK-2.8.10.1-r5.ebuild, wxGTK-2.8.11.0.ebuild, wxGTK-2.8.12.0.ebuild,
+  wxGTK-2.9.1.1.ebuild:
+  Corrected Slotting and versioning, thanks leio spotting that
+
+  12 Nov 2011; Justin Lecher <jlec@g.o> wxGTK-2.9.1.1.ebuild:
+  Import prefix changes, all are triggered by USE=aqua
+
+  12 Nov 2011; Justin Lecher <jlec@g.o> wxGTK-2.6.4.0-r6.ebuild,
+  wxGTK-2.8.10.1-r5.ebuild, wxGTK-2.8.11.0.ebuild, wxGTK-2.8.12.0.ebuild,
+  wxGTK-2.9.1.1.ebuild, metadata.xml:
+  Corrected slotting for png and tiff, resorted ebuild to fit common sense
+  order, removed unnessesary die
+
+  25 Oct 2011; Ryan Hill <dirtyepic@g.o> wxGTK-2.9.1.1.ebuild:
+  Apply libpng-1.5 patch to 2.9 as well.
+
+  09 Oct 2011; Samuli Suominen <ssuominen@g.o> wxGTK-2.8.12.0.ebuild,
+  wxGTK-2.9.1.1.ebuild:
+  Missing gst-plugins-base depend for -lgstinterfaces-0.10 checked by
+  configure.in.
+
+  15 Sep 2011; Samuli Suominen <ssuominen@g.o> wxGTK-2.6.4.0-r6.ebuild:
+  Fix building with libpng15 wrt #380833 by Diego Elio Pettenò
+
+  16 Jul 2011; Kacper Kowalik <xarthisius@g.o> wxGTK-2.8.11.0.ebuild:
+  ppc64 stable wrt #364203
+
+  28 Jun 2011; Brent Baude <ranger@g.o> wxGTK-2.8.11.0.ebuild:
+  Marking wxGTK-2.8.11.0 ppc for bug 364203
+
+  04 Jun 2011; Raúl Porcel <armin76@g.o> wxGTK-2.8.11.0.ebuild:
+  alpha/ia64/sh/sparc stable wrt #364203
+
+  21 May 2011; Thomas Kahle <tomka@g.o> wxGTK-2.8.11.0.ebuild:
+  x86 stable per bug 364203
+
+  13 May 2011; Markus Meier <maekke@g.o> wxGTK-2.8.11.0.ebuild:
+  arm stable, bug #364203
+
+  27 Apr 2011; Christoph Mende <angelos@g.o> wxGTK-2.8.11.0.ebuild:
+  Stable on amd64 wrt bug #364203
+
+  26 Apr 2011; Jeroen Roovers <jer@g.o> wxGTK-2.8.11.0.ebuild:
+  Stable for HPPA (bug #364203).
+
+*wxGTK-2.8.12.0 (20 Apr 2011)
+
+  20 Apr 2011; Ryan Hill <dirtyepic@g.o> +wxGTK-2.8.12.0.ebuild:
+  Version bump (bug #363319).
+
+  29 Mar 2011; Christoph Mende <angelos@g.o> wxGTK-2.6.4.0-r6.ebuild:
+  Fix gtk+ slot deps
+
+  19 Mar 2011; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.8.11-libpng15.patch, wxGTK-2.8.11.0.ebuild:
+  Add patch fixing build with libpng-1.5 (bug #355035).
+
+  27 Feb 2011; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.10.1-r5.ebuild,
+  wxGTK-2.8.11.0.ebuild, wxGTK-2.9.1.1.ebuild:
+  Slot gnome stuff.
+
+  26 Feb 2011; Kevin McCarthy <signals@g.o> wxGTK-2.6.4.0-r6.ebuild:
+  Updated depends from media-libs/jpeg to virtual/jpeg
+
+*wxGTK-2.9.1.1 (23 Jan 2011)
+
+  23 Jan 2011; Ryan Hill <dirtyepic@g.o> -wxGTK-2.9.1.ebuild,
+  +wxGTK-2.9.1.1.ebuild, +files/wxGTK-2.9.1.1-collision.patch,
+  -files/wxGTK-2.9.1-collision.patch:
+  Version bump. Remove old.
+
+  23 Nov 2010; Justin Lecher <jlec@g.o> wxGTK-2.8.10.1-r5.ebuild,
+  wxGTK-2.8.11.0.ebuild, wxGTK-2.9.1.ebuild:
+  Moved to virtual/jpeg, tested by me: compilation and runtime
+
+*wxGTK-2.9.1 (14 Aug 2010)
+
+  14 Aug 2010; Ryan Hill <dirtyepic@g.o> +wxGTK-2.9.1.ebuild,
+  +files/wxGTK-2.9.1-collision.patch:
+  Add 2.9 development branch (bug #298387 by sping).
+
+  29 Jun 2010; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.11.0.ebuild:
+  Really make tiff dependency optional (bug #326061).
+
+*wxGTK-2.8.11.0 (27 May 2010)
+
+  27 May 2010; Ryan Hill <dirtyepic@g.o> -wxGTK-2.6.4.0-r5.ebuild,
+  -wxGTK-2.8.10.1-r1.ebuild, +wxGTK-2.8.11.0.ebuild,
+  +files/wxGTK-2.8.11-collision.patch,
+  +files/wxGTK-2.8.11-unicode-odbc.patch:
+  Version bump, remove old.
+
+  09 Apr 2010; Jeroen Roovers <jer@g.o> wxGTK-2.6.4.0-r6.ebuild,
+  wxGTK-2.8.10.1-r5.ebuild:
+  Stable for HPPA (bug #305331).
+
+  07 Apr 2010; Brent Baude <ranger@g.o> wxGTK-2.6.4.0-r6.ebuild,
+  wxGTK-2.8.10.1-r5.ebuild:
+  Marking wxGTK-2.6.4.0-r6 and wxGTK-2.8.10.1-r5 ppc for bug 305331
+
+  02 Apr 2010; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r6.ebuild,
+  wxGTK-2.8.10.1-r5.ebuild, +files/wxGTK-2.8.10.1-odbc-defines.patch:
+  Build fix for unixODBC-2.2.14 (bug #310923 by Martin von Gagern).
+
+  21 Mar 2010; Brent Baude <ranger@g.o> wxGTK-2.6.4.0-r6.ebuild,
+  wxGTK-2.8.10.1-r5.ebuild:
+  Marking wxGTK-2.6.4.0-r6 and -2.8.10.1-r5 for bug 305331
+
+  14 Mar 2010; Raúl Porcel <armin76@g.o> wxGTK-2.6.4.0-r6.ebuild,
+  wxGTK-2.8.10.1-r5.ebuild:
+  alpha/arm/ia64/sh/sparc stable wrt #305331
+
+  09 Mar 2010; Ryan Hill <dirtyepic@g.o> metadata.xml:
+  Add note about modifications to metadata.xml.
+
+  21 Feb 2010; Christian Faulhammer <fauli@g.o>
+  wxGTK-2.6.4.0-r6.ebuild, wxGTK-2.8.10.1-r5.ebuild:
+  stable x86, bug 305331
+
+  19 Feb 2010; Pacho Ramos <pacho@g.o> wxGTK-2.6.4.0-r6.ebuild,
+  wxGTK-2.8.10.1-r5.ebuild:
+  amd64 stable, bug 305331
+
+  14 Feb 2010; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r6.ebuild,
+  wxGTK-2.8.10.1-r5.ebuild:
+  Build fix for >=libpng-1.4.0 (bug #305119 by Poly-C). Also ensure system
+  libs are always being used.
+
+*wxGTK-2.8.10.1-r5 (02 Feb 2010)
+
+  02 Feb 2010; Ryan Hill <dirtyepic@g.o>
+  -files/wxGTK-2.8.6-wxrc_link_fix.patch,
+  -files/wxGTK-2.8.8-collision.patch,
+  -files/wxGTK-2.8.9.2-nestedtables.patch,
+  -files/wxGTK-2.8.9-dont-touch-my-bools.patch, -wxGTK-2.8.10.1-r3.ebuild,
+  -wxGTK-2.8.10.1-r4.ebuild, +wxGTK-2.8.10.1-r5.ebuild,
+  files/wxGTK-2.8.10-collision.patch:
+  Revbump to fix typo in collision patch. Remove unused patches.
+
+*wxGTK-2.8.10.1-r4 (19 Jan 2010)
+
+  19 Jan 2010; Ryan Hill <dirtyepic@g.o> +wxGTK-2.8.10.1-r4.ebuild,
+  +files/wxGTK-2.8.10.1-wxTimer-unbounded-hook.patch:
+  Added upstream patch to prevent leaking timer handles in idle apps. (Bug
+  #301143 by Richard Ash)
+
+  15 Sep 2009; Ryan Hill <dirtyepic@g.o> -wxGTK-2.6.4.0-r4.ebuild,
+  -wxGTK-2.8.9.1-r3.ebuild, -wxGTK-2.8.9.2-r1.ebuild,
+  -wxGTK-2.8.10.1.ebuild:
+  Remove old.
+
+  09 Aug 2009; nixnut <nixnut@g.o> wxGTK-2.6.4.0-r5.ebuild:
+  ppc stable #277722
+
+*wxGTK-2.8.10.1-r3 (06 Aug 2009)
+*wxGTK-2.6.4.0-r6 (06 Aug 2009)
+
+  06 Aug 2009; Ryan Hill <dirtyepic@g.o> +wxGTK-2.6.4.0-r6.ebuild,
+  +wxGTK-2.8.10.1-r3.ebuild, +files/wxGTK-2.8.10.1-gsocket.patch:
+  Add patch from upstream to fix symbol conflict with GSocket struct from
+  developmental glib currently in gnome-overlay. Bug #278778.
+
+  29 Jul 2009; Markus Meier <maekke@g.o> wxGTK-2.6.4.0-r5.ebuild,
+  wxGTK-2.8.10.1-r1.ebuild:
+  amd64 stable, bug #277722
+
+  26 Jul 2009; Brent Baude <ranger@g.o> wxGTK-2.6.4.0-r5.ebuild,
+  wxGTK-2.8.10.1-r1.ebuild:
+  Marking wxGTK-2.6.4.0-r5 and wxGTK-2.8.10.1-r1 ppc64 for bug 277722
+
+  25 Jul 2009; Ryan Hill <dirtyepic@g.o> Manifest:
+  Fix Manifest.
+
+  23 Jul 2009; Raúl Porcel <armin76@g.o> wxGTK-2.6.4.0-r5.ebuild,
+  wxGTK-2.8.10.1-r1.ebuild:
+  arm/ia64/sh stable wrt #277722
+
+  22 Jul 2009; Jeroen Roovers <jer@g.o> wxGTK-2.6.4.0-r5.ebuild:
+  Stable for HPPA (bug #277722).
+
+  21 Jul 2009; Ferris McCormick <fmccor@g.o>
+  wxGTK-2.8.10.1-r1.ebuild:
+  Sparc stable, bug #277722.
+
+  21 Jul 2009; Ferris McCormick <fmccor@g.o> wxGTK-2.6.4.0-r5.ebuild:
+  Sparc stable, bug #277722.
+
+*wxGTK-2.8.10.1-r2 (21 Jul 2009)
+
+  21 Jul 2009; Markus Ullmann <jokey@g.o> +wxGTK-2.8.10.1-r2.ebuild,
+  +files/wxGTK-2.8.10.1-slot-bake-b0rkage.patch:
+  Add patch to fix slot b0rkage
+
+  21 Jul 2009; Tobias Klausmann <klausman@g.o>
+  wxGTK-2.6.4.0-r5.ebuild:
+  Stable on alpha, bug #277722
+
+  21 Jul 2009; Christian Faulhammer <fauli@g.o>
+  wxGTK-2.6.4.0-r5.ebuild:
+  stable x86, security bug 277722
+
+  21 Jul 2009; Christian Faulhammer <fauli@g.o>
+  wxGTK-2.8.10.1-r1.ebuild:
+  stable x86, security bug 277722
+
+  21 Jul 2009; Jeroen Roovers <jer@g.o> wxGTK-2.8.10.1-r1.ebuild:
+  Stable for HPPA (bug #277722).
+
+*wxGTK-2.6.4.0-r5 (20 Jul 2009)
+
+  20 Jul 2009; Ryan Hill <dirtyepic@g.o> +wxGTK-2.6.4.0-r5.ebuild:
+  Patch added for CVE-2009-2369. Bug #277722.
+
+  19 Jul 2009; nixnut <nixnut@g.o> wxGTK-2.8.10.1-r1.ebuild:
+  ppc stable #277722
+
+  19 Jul 2009; Tobias Klausmann <klausman@g.o>
+  wxGTK-2.8.10.1-r1.ebuild:
+  Stable on alpha, bug #277722
+
+*wxGTK-2.8.10.1-r1 (19 Jul 2009)
+
+  19 Jul 2009; Ryan Hill <dirtyepic@g.o> +wxGTK-2.8.10.1-r1.ebuild,
+  +files/wxGTK-2.8.10.1-CVE-2009-2369.patch:
+  Patch added for CVE-2009-2369. Bug #277722.
+
+*wxGTK-2.8.10.1 (18 May 2009)
+
+  18 May 2009; Ryan Hill <dirtyepic@g.o>
+  -files/wxGTK-2.8.4-collision.patch, -files/wxGTK-2.8.7-race-fix.patch,
+  -wxGTK-2.8.9.2.ebuild, +wxGTK-2.8.10.1.ebuild,
+  +files/wxGTK-2.8.10-collision.patch:
+  Version bump.
+
+*wxGTK-2.8.9.2-r1 (25 Apr 2009)
+
+  25 Apr 2009; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.8.9.2-nestedtables.patch, wxGTK-2.8.9.1-r3, wxGTK-2.8.9.2,
+  +wxGTK-2.8.9.2-r1.ebuild:
+  - Fix nested HTML tables (bug #264544, Ivan Trombley)
+  - Add missing gconf dependency with USE=gstreamer (bug #267022, Morten Lied 
+    Johansen)
+
+*wxGTK-2.8.9.2 (21 Feb 2009)
+
+  21 Feb 2009; Ryan Hill <dirtyepic@g.o> +wxGTK-2.8.9.2.ebuild:
+  Version bump.
+
+  15 Feb 2009; Ryan Hill <dirtyepic@g.o> -wxGTK-2.8.8.1.ebuild,
+  -wxGTK-2.8.9.1-r2.ebuild:
+  Remove old.
+
+  15 Feb 2009; Brent Baude <ranger@g.o> wxGTK-2.8.9.1-r3.ebuild:
+  Marking wxGTK-2.8.9.1-r3 ppc for bug 254696
+
+  07 Feb 2009; Raúl Porcel <armin76@g.o> wxGTK-2.8.9.1-r3.ebuild:
+  arm/ia64/sh/sparc stable wrt #254696
+
+  06 Feb 2009; Jeroen Roovers <jer@g.o> wxGTK-2.8.9.1-r3.ebuild:
+  Stable for HPPA (bug #254696).
+
+  28 Jan 2009; Brent Baude <ranger@g.o> wxGTK-2.8.9.1-r3.ebuild:
+  Marking wxGTK-2.8.9.1-r3 ppc64 for bug 254696
+
+  24 Jan 2009; Ryan Hill <dirtyepic@g.o> -wxGTK-2.6.4.0-r1.ebuild:
+  Drop ancient ebuild.
+
+  22 Jan 2009; Raúl Porcel <armin76@g.o> wxGTK-2.6.4.0-r4.ebuild:
+  arm/sh stable
+
+  22 Jan 2009; Raúl Porcel <armin76@g.o> wxGTK-2.6.4.0-r4.ebuild,
+  wxGTK-2.8.9.1-r3.ebuild:
+  Readd ~arm/~sh
+
+  18 Jan 2009; Markus Meier <maekke@g.o> wxGTK-2.8.9.1-r3.ebuild:
+  amd64/x86 stable, bug #254696
+
+  18 Jan 2009; Tobias Klausmann <klausman@g.o>
+  wxGTK-2.8.9.1-r3.ebuild:
+  Stable on alpha, bug #254696
+
+  22 Nov 2008; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r1.ebuild:
+  Drop all but arm and sh until they keyword eselect-wxwidgets.
+
+*wxGTK-2.8.9.1-r3 (07 Nov 2008)
+*wxGTK-2.8.9.1-r2 (07 Nov 2008)
+
+  07 Nov 2008; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.8.9-dont-touch-my-bools.patch, -wxGTK-2.8.9.1.ebuild,
+  -wxGTK-2.8.9.1-r1.ebuild, +wxGTK-2.8.9.1-r2.ebuild,
+  +wxGTK-2.8.9.1-r3.ebuild:
+  Added a patch from Martin von Gagern in bug #245973 to prevent wx/db.h
+  from undefining BOOL when USE=odbc. Patch accepted upstream. New stable
+  candidate is -r2.
+
+  28 Oct 2008; Ryan Hill <dirtyepic@g.o>
+  files/wxGTK-2.8.8-collision.patch:
+  Fix collision patch to not install unversioned bakefile presets again to
+  prevent clobbering the symlinks created by eselect-wxwidgets. David
+  Leverton - Bug #243446.
+
+  28 Oct 2008; Ryan Hill <dirtyepic@g.o> -wxGTK-2.6.4.0-r3.ebuild,
+  -wxGTK-2.8.7.1-r1.ebuild, -wxGTK-2.8.7.1-r2.ebuild, -wxGTK-2.8.8.0.ebuild:
+  Drop old.
+
+  27 Oct 2008; Jeroen Roovers <jer@g.o> wxGTK-2.6.4.0-r4.ebuild,
+  wxGTK-2.8.8.1.ebuild:
+  Stable for HPPA (bug #242088).
+
+*wxGTK-2.8.9.1-r1 (18 Oct 2008)
+
+  18 Oct 2008; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.9.1.ebuild,
+  +wxGTK-2.8.9.1-r1.ebuild:
+  Revert to EAPI 0 for stable candidate. Add new -r1 using EAPI 2.
+
+  18 Oct 2008; Raúl Porcel <armin76@g.o> wxGTK-2.6.4.0-r4.ebuild,
+  wxGTK-2.8.8.1.ebuild:
+  alpha/ia64/sparc stable wrt #242088
+
+  16 Oct 2008; Markus Meier <maekke@g.o> wxGTK-2.6.4.0-r4.ebuild,
+  wxGTK-2.8.8.1.ebuild:
+  amd64/x86 stable, bug #242088
+
+  15 Oct 2008; Markus Rothe <corsair@g.o> wxGTK-2.6.4.0-r4.ebuild,
+  wxGTK-2.8.8.1.ebuild:
+  Stable on ppc64; bug #242088
+
+  15 Oct 2008; Ferris McCormick <fmccor@g.o> wxGTK-2.8.8.1.ebuild:
+  Sparc stable, part of Bug #242088.
+
+  15 Oct 2008; Brent Baude <ranger@g.o> wxGTK-2.6.4.0-r4.ebuild,
+  wxGTK-2.8.8.1.ebuild:
+  Marking  wxGTK-2.6.4.0-r4 ppc for bug 242088
+
+  15 Oct 2008; Brent Baude <ranger@g.o> wxGTK-2.8.8.1.ebuild:
+  Marking wxGTK-2.8.8.1 ppc for bug 242088
+
+  14 Oct 2008; Ferris McCormick <fmccor@g.o> wxGTK-2.6.4.0-r4.ebuild:
+  Sparc stable --- the rest of Bug #242088 on sparc.
+
+  14 Oct 2008; Ferris McCormick <fmccor@g.o> wxGTK-2.8.7.1-r2.ebuild:
+  Sparc stable --- Bug #242088 --- it's been around forever.
+
+*wxGTK-2.8.9.1 (14 Oct 2008)
+
+  14 Oct 2008; Ryan Hill <dirtyepic@g.o> +wxGTK-2.8.9.1.ebuild:
+  Version bump. EAPI 2.
+
+  30 Jul 2008; Ryan Hill <dirtyepic@g.o> metadata.xml:
+  Add USE flag descriptions to metadata.xml.
+
+*wxGTK-2.8.8.1 (25 Jul 2008)
+
+  25 Jul 2008; Ryan Hill <dirtyepic@g.o> +wxGTK-2.8.8.1.ebuild:
+  Version bump.
+
+  16 Jul 2008; Alexis Ballier <aballier@g.o> wxGTK-2.6.4.0-r4.ebuild,
+  wxGTK-2.8.8.0.ebuild:
+  keyword ~x86-fbsd, thanks to Henning Schild <henning@××××××××××××××.de>,
+  bug #231620
+
+*wxGTK-2.8.8.0 (29 Jun 2008)
+
+  29 Jun 2008; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.8.8-collision.patch, +wxGTK-2.8.8.0.ebuild:
+  Version bump.
+
+*wxGTK-2.6.4.0-r4 (29 Jun 2008)
+
+  29 Jun 2008; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.6.4-mmedia.patch, +wxGTK-2.6.4.0-r4.ebuild:
+  Stop installing the mmedia library which has an automagic dependency on
+  esd. Bug #174874 by Volker Hemmann.
+
+*wxGTK-2.8.7.1-r2 (07 Jun 2008)
+
+  07 Jun 2008; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.8.7-race-fix.patch, +wxGTK-2.8.7.1-r2.ebuild:
+  Add patch from upstream to fix race condition in wxWakeUpIdle.
+
+  17 Mar 2008; Peter Volkov <pva@g.o> wxGTK-2.6.4.0-r3.ebuild,
+  wxGTK-2.8.7.1-r1.ebuild:
+  amd64 stable, bug #207648.
+
+  16 Mar 2008; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r3.ebuild:
+  Keyword ~mips.
+
+  18 Feb 2008; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.7.1-r1.ebuild:
+  Add ~mips.
+
+  08 Feb 2008; Ryan Hill <dirtyepic@g.o>
+  files/wxGTK-2.6.4-collision.patch, files/wxGTK-2.8.4-collision.patch:
+  Drop the bakefile hunks of the collision patches that don't work as
+  expected. Now handled by eselect-wxwidgets.
+
+  29 Jan 2008; nixnut <nixnut@g.o> wxGTK-2.6.4.0-r3.ebuild,
+  wxGTK-2.8.7.1-r1.ebuild:
+  Stable on ppc wrt bug 207648
+
+  28 Jan 2008; Jeroen Roovers <jer@g.o> wxGTK-2.6.4.0-r3.ebuild,
+  wxGTK-2.8.7.1-r1.ebuild:
+  Stable for HPPA (bug #207648).
+
+  28 Jan 2008; Raúl Porcel <armin76@g.o> metadata.xml:
+  Replace wxwindows with wxwidgets in metadata
+
+  27 Jan 2008; Raúl Porcel <armin76@g.o> wxGTK-2.6.4.0-r3.ebuild,
+  wxGTK-2.8.7.1-r1.ebuild:
+  alpha/ia64/sparc stable wrt #207648
+
+  27 Jan 2008; Brent Baude <ranger@g.o> wxGTK-2.6.4.0-r3.ebuild:
+  Marking wxGTK-2.6.4.0-r3 ppc64 for bug 207648
+
+  27 Jan 2008; Brent Baude <ranger@g.o> wxGTK-2.8.7.1-r1.ebuild:
+  Marking wxGTK-2.8.7.1-r1 ppc64 for bug 207648
+
+  27 Jan 2008; Christian Faulhammer <opfer@g.o>
+  wxGTK-2.6.4.0-r3.ebuild:
+  stable x86, bug 207648
+
+  27 Jan 2008; Christian Faulhammer <opfer@g.o>
+  wxGTK-2.8.7.1-r1.ebuild:
+  stable x86, bug 207648
+
+  12 Jan 2008; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.7.1-r1.ebuild:
+  Install some random stuff into DOCDIR.
+
+  07 Jan 2008; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.7.1-r1.ebuild:
+  We no longer need to depend on gnome-vfs.
+
+*wxGTK-2.8.7.1-r1 (06 Jan 2008)
+
+  06 Jan 2008; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.8.7-mmedia.patch, -wxGTK-2.8.7.1.ebuild,
+  +wxGTK-2.8.7.1-r1.ebuild:
+  Revision bump.
+   - prevent segfault by configuring with --without-gnomevfs (Bug #203389)
+   - don't build the mmedia contrib library (indirectly fixes Bug #174874)
+
+  23 Dec 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.7.1.ebuild:
+  Restore dropped ppc keyword for bug #199594.
+
+  22 Dec 2007; nixnut <nixnut@g.o> wxGTK-2.6.4.0-r3.ebuild:
+  Added ~ppc wrt bug 199594
+
+*wxGTK-2.6.4.0-r3 (20 Dec 2007)
+
+  20 Dec 2007; Ryan Hill <dirtyepic@g.o>
+  -files/wxGTK-2.6.3.3-dialog_focus.patch,
+  -files/wxGTK-2.6.3.3-slider_linesize.patch,
+  -files/wxGTK-2.6.3.3-wxrc_build_fix.patch,
+  -files/wxGTK-2.6.3.3-wxrc_link_fix.patch,
+  files/wxGTK-2.6.4-collision.patch, files/wxGTK-2.8.4-collision.patch,
+  -wxGTK-2.6.3.3.ebuild, -wxGTK-2.6.4.0-r2.ebuild, +wxGTK-2.6.4.0-r3.ebuild,
+  wxGTK-2.8.7.1.ebuild:
+  Move wxwin.m4 handling to eselect-wxwidgets. Remove old.
+
+  15 Dec 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.7.1.ebuild:
+  Pass --enable-graphics_ctx to configure for wxWebKit/Editra/leio.
+
+  13 Dec 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r2.ebuild,
+  wxGTK-2.8.7.1.ebuild:
+  Drop arm, ppc, sh, and x86-fbsd keywords for bug #199594.
+
+  12 Dec 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r2.ebuild,
+  wxGTK-2.8.7.1.ebuild:
+  Move eselect-wxwidgets to PDEPEND to prevent blocker on upgrade. Because
+  wxGTK may now be installed before eselect-wxwidgets, make post{inst,rm}
+  update conditional on it being available. Remove messy
+  auto-set-profile-if-profile-is-"none" stuff and just default to "none".
+
+  06 Dec 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r1.ebuild:
+  Backport precompiled header option from later ebuilds for hardened. Bug
+  #201250.
+
+  04 Dec 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.7.1.ebuild:
+  Fix docs installation.  Reported by eldenz.
+
+*wxGTK-2.8.7.1 (03 Dec 2007)
+
+  03 Dec 2007; Ryan Hill <dirtyepic@g.o>
+  -files/wxGTK-2.8.6-extralibs-media.patch, -wxGTK-2.8.6.1.ebuild,
+  +wxGTK-2.8.7.1.ebuild:
+  Version bump.
+
+  03 Dec 2007; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.8.6-wxrc_link_fix.patch, wxGTK-2.8.6.1.ebuild:
+  Port wxrc link patch to 2.8, where it turns out it hasn't been applied yet
+  like I thought. Thanks to devurandom.
+
+  30 Nov 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r2.ebuild,
+  wxGTK-2.8.6.1.ebuild:
+  Re-add local pch USE flag.
+
+*wxGTK-2.8.6.1 (29 Nov 2007)
+
+  29 Nov 2007; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.8.4-collision.patch,
+  +files/wxGTK-2.8.6-extralibs-media.patch, +wxGTK-2.8.6.1.ebuild:
+  Add 2.8.6.1 for testing.
+
+  24 Nov 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r2.ebuild:
+  Make --disable-precomp-headers the default since it also cuts 1/3 off the
+  build time.
+
+  24 Nov 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r2.ebuild:
+  Add pch USE flag to control precompiled header support as suggested by
+  Rafał Mużyło. Drop joystick USE flag.
+
+*wxGTK-2.6.4.0-r2 (18 Nov 2007)
+
+  18 Nov 2007; Ryan Hill <dirtyepic@g.o> +wxGTK-2.6.4.0-r2.ebuild:
+  Revision bump using the wxwidgets eselect module. Masked until said module
+  is keyworded.
+
+  04 Nov 2007; Christoph Mende <angelos@g.o> wxGTK-2.6.4.0-r1.ebuild:
+  Stable on amd64 wrt bug #197186
+
+  30 Oct 2007; Jeroen Roovers <jer@g.o> wxGTK-2.6.4.0-r1.ebuild:
+  Stable for HPPA (bug #197186).
+
+  28 Oct 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0-r1.ebuild:
+  Fix dropped proto DEPENDs for Cyborg in bug #197186.
+
+  28 Oct 2007; Markus Rothe <corsair@g.o> wxGTK-2.6.4.0-r1.ebuild:
+  Stable on ppc64; bug #197186
+
+  27 Oct 2007; nixnut <nixnut@g.o> wxGTK-2.6.4.0-r1.ebuild:
+  Stable on ppc wrt bug 197186
+
+  27 Oct 2007; Raúl Porcel <armin76@g.o> wxGTK-2.6.4.0-r1.ebuild:
+  alpha/ia64/sparc stable wrt #197186
+
+  27 Oct 2007; Christian Faulhammer <opfer@g.o>
+  wxGTK-2.6.4.0-r1.ebuild:
+  stable x86, bug 197186
+
+*wxGTK-2.6.4.0-r1 (27 Oct 2007)
+
+  27 Oct 2007; Ryan Hill <dirtyepic@g.o> -wxGTK-2.6.4.0.ebuild,
+  +wxGTK-2.6.4.0-r1.ebuild:
+  Revision bump to push out various minor fixes.  Target for stabilization.
+
+  25 Oct 2007; Ryan Hill <dirtyepic@g.o>
+  files/wxGTK-2.6.4-collision.patch:
+  Update collision patch to take into account new names of bakefile presets.
+
+  25 Oct 2007; Ryan Hill <dirtyepic@g.o> ChangeLog, Manifest:
+  Fix docs installation.
+
+  09 Sep 2007; Ryan Hill <dirtyepic@g.o>
+  files/wxGTK-2.6.4-collision.patch, wxGTK-2.6.4.0.ebuild:
+  Update collision patch to handle wxrc.
+
+  02 Sep 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.4.0.ebuild:
+  Re-keyword.
+
+  01 Sep 2007; Ryan Hill <dirtyepic@g.o>
+  files/wxGTK-2.6.4.0-wxrc_link_fix.patch:
+  Convert patch from DOS to Unix newlines.
+
+*wxGTK-2.6.4.0 (01 Sep 2007)
+
+  01 Sep 2007; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.6.3-unicode-odbc.patch, +files/wxGTK-2.6.4.0-g_free.patch,
+  +files/wxGTK-2.6.4.0-wxrc_link_fix.patch,
+  +files/wxGTK-2.6.4-collision.patch, +wxGTK-2.6.4.0.ebuild:
+  Version bump. This is a major ebuild and build system rewrite. It may cause
+  breakage, so all untested arch keywords were dropped. Please test and
+  re-keyword. Will be unmasked after enough testing is done.
+
+  24 Jul 2007; Ryan Hill <dirtyepic@g.o>
+  -files/wxGTK-2.4.1-contrib.patch, -files/wxGTK-2.4.2-cleanup.patch,
+  -files/wxGTK-2.4.2-contrib_animate.patch, -files/wxGTK-2.4.2-gcc4.patch,
+  -files/wxGTK-2.4.2-menu.cpp.patch, -files/wxGTK-2.4.2-noftinternals.patch,
+  -files/wxGTK-2.4.2-pango_fix.patch, -files/intl.cpp.diff,
+  -wxGTK-2.4.2-r4.ebuild:
+  Kill wxGTK-2.4.  Fixes bug #145032.
+
+  24 Mar 2007; Ryan Hill <dirtyepic@g.o>
+  -files/wxWidgets-2.6.2-gcc41.patch, -wxGTK-2.6.2-r1.ebuild:
+  Remove obsolete version.
+
+  12 Mar 2007; Jose Luis Rivero <yoswink@g.o> wxGTK-2.6.3.3.ebuild:
+  Stable on alpha wrt bug #136924
+
+  10 Feb 2007; Simon Stelling <blubb@g.o> wxGTK-2.6.3.3.ebuild:
+  stable on amd64; bug 136924
+
+  20 Jan 2007; Jeroen Roovers <jer@g.o> wxGTK-2.6.3.3.ebuild:
+  Stable for HPPA (bug #136924).
+
+  16 Jan 2007; Joseph Jezak <josejx@g.o> wxGTK-2.6.3.3.ebuild:
+  Marked ppc stable for bug #136924.
+
+  15 Jan 2007; Raúl Porcel <armin76@g.o> wxGTK-2.6.3.3.ebuild:
+  x86 stable, wrt bug 136924
+
+  15 Jan 2007; Gustavo Zacarias <gustavoz@g.o> wxGTK-2.6.3.3.ebuild:
+  Stable on sparc wrt #136924
+
+  14 Jan 2007; Markus Rothe <corsair@g.o> wxGTK-2.6.3.3.ebuild:
+  Stable on ppc64; bug #136924
+
+  12 Jan 2007; Mart Raudsepp <leio@g.o>
+  +files/wxGTK-2.6.3.3-wxrc_link_fix.patch, wxGTK-2.6.3.3.ebuild:
+  Build fix for wxrc in presence of an already installed (incompatible) wxGTK,
+  bug 150435
+
+  06 Jan 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.4.2-r4.ebuild,
+  wxGTK-2.6.2-r1.ebuild:
+  Fix bug #160197 by converting configure calls to econf. Also clean up a
+  little.
+
+  05 Jan 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.4.2-r4.ebuild,
+  wxGTK-2.6.2-r1.ebuild, wxGTK-2.6.3.3.ebuild:
+  einfo -> elog
+
+  05 Jan 2007; Ryan Hill <dirtyepic@g.o> ChangeLog:
+  On second thought unspecified but required eclasses are probably a bad thing.
+
+  04 Jan 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.6.3.3.ebuild:
+  Remove debug.eclass usage (bug #160116), and clean up redundant inherits.
+
+  30 Dec 2006; <leio@g.o> -wxGTK-2.6.1.ebuild:
+  Remove redundant version
+
+  28 Dec 2006; Ryan Hill <dirtyepic@g.o> wxGTK-2.4.2-r4.ebuild:
+  gtk2 -> gtk
+
+  23 Nov 2006; <yvasilev@g.o> wxGTK-2.6.3.3.ebuild:
+  Keyworded arm on request by leio.
+
+  15 Oct 2006; Mart Raudsepp <leio@g.o> -wxGTK-2.6.3.2.ebuild:
+  Remove old version with broken wxrc build
+
+  15 Oct 2006; Aron Griffis <agriffis@g.o>
+  +files/wxGTK-2.4.2-noftinternals.patch, wxGTK-2.4.2-r4.ebuild:
+  Add patch for freetype-2.2.1 API compatibility #150383
+
+  24 Sep 2006; Mart Raudsepp <leio@g.o> wxGTK-2.6.3.3.ebuild:
+  Fix typo in RDEPEND.
+
+*wxGTK-2.6.3.3 (24 Sep 2006)
+
+  24 Sep 2006; Mart Raudsepp <leio@g.o>
+  +files/wxGTK-2.6.3.3-dialog_focus.patch,
+  +files/wxGTK-2.6.3.3-slider_linesize.patch,
+  +files/wxGTK-2.6.3.3-wxrc_build_fix.patch, +wxGTK-2.6.3.3.ebuild:
+  Migrate away from wxlib.eclass. Fix depends. Allow parallel building. Grab
+  some relatively important patches from upstream. Ensure the wxrc tool is
+  built and installed. Restore ABI compatibility with latest stable version
+  (2.6.2-r1). Install HTML documentation with USE=doc properly again. Closes
+  bugs #147394 and #123786.
+
+  04 Sep 2006; Mart Raudsepp <leio@g.o>
+  -files/wxGTK-2.6.1-windowcpp.diff, -wxGTK-2.6.1-r1.ebuild,
+  -wxGTK-2.6.2.ebuild:
+  Clean up unnecessary versions.
+
+  05 Aug 2006; Mart Raudsepp <leio@g.o> wxGTK-2.6.3.2.ebuild:
+  Depend on the correct sdl package.
+
+  09 Jul 2006; Javier Villavicencio <the_paya@g.o>
+  wxGTK-2.6.3.2.ebuild:
+  Added ~x86-fbsd keyword.
+
+  25 Apr 2006; Mark Loeser <halcy0n@g.o> wxGTK-2.6.3.2.ebuild:
+  Add flag-o-matic since we use append-flags
+
+*wxGTK-2.6.3.2 (13 Apr 2006)
+
+  13 Apr 2006; Mark Loeser <halcy0n@g.o> +wxGTK-2.6.3.2.ebuild:
+  Bump to new upstream version, thanks to Mart Raudsepp <leio AT dustbite DOT
+  net> for the new ebuild; bug #127734 and #109515
+
+  13 Apr 2006; Alin Nastac <mrness@g.o>
+  -files/wxGTK-2.4.1-wxpython1.patch, -files/wxGTK-2.4.1-wxpython2.patch,
+  -wxGTK-2.4.2-r2.ebuild, -wxGTK-2.4.2-r3.ebuild, -wxGTK-2.5.3.ebuild,
+  -wxGTK-2.6.0-r1.ebuild:
+  Remove obsolete versions.
+
+  01 Apr 2006; Alec Warner <antarus@g.o> wxGTK-2.6.2-r1.ebuild,
+  -wxGTK-2.6.2-r2.ebuild:
+  No Revbump needed, Duh
+
+*wxGTK-2.6.2-r2 (01 Apr 2006)
+
+  01 Apr 2006; Alec Warner <antarus@g.o> +wxGTK-2.6.2-r2.ebuild:
+  QA fix for bug #119072
+
+  22 Mar 2006; Gustavo Zacarias <gustavoz@g.o> wxGTK-2.6.2-r1.ebuild:
+  Stable on hppa wrt #105189 #120333
+
+  15 Mar 2006; Mark Loeser <halcy0n@g.o>
+  files/wxGTK-2.4.2-gcc4.patch:
+  Update gcc4 patch by wormo AT gentoo DOT org; bug #123323
+
+  20 Feb 2006; Markus Rothe <corsair@g.o> wxGTK-2.6.2-r1.ebuild:
+  Stable on ppc64
+
+  13 Feb 2006; Mark Loeser <halcy0n@g.o>
+  +files/wxGTK-2.4.2-gcc4.patch, wxGTK-2.4.2-r4.ebuild:
+  Thanks to Chris Fairles <cafairle AT engmail DOT uwaterloo DOT ca> for the
+  gcc-4 patch; bug #117357
+
+  03 Feb 2006; Aron Griffis <agriffis@g.o> wxGTK-2.6.2-r1.ebuild:
+  Mark 2.6.2-r1 stable on ia64
+
+  31 Jan 2006; Jose Luis Rivero <yoswink@g.o> wxGTK-2.6.2-r1.ebuild:
+  Stable on alpha wrt bug #120333
+
+  30 Jan 2006; Joshua Jackson <tsunam@g.o> wxGTK-2.6.2-r1.ebuild:
+  Stable on x86 for bug #120333
+
+  28 Jan 2006; Tobias Scherbaum <dertobi123@g.o>
+  wxGTK-2.6.2-r1.ebuild:
+  Stable on ppc, bug #120333
+
+  28 Jan 2006; Markus Rothe <corsair@g.o> wxGTK-2.6.1-r1.ebuild:
+  Stable on ppc64; bug #120333
+
+  28 Jan 2006; Jason Wever <weeve@g.o> wxGTK-2.6.1-r1.ebuild:
+  Stable on SPARC.  Thanks for KingTaco noticing the oops.
+
+  28 Jan 2006; Karol Wojtaszek <sekretarz@g.o> wxGTK-2.6.2-r1.ebuild:
+  Stable on amd64, bug #120333
+
+  27 Jan 2006; Michael Hanselmann <hansmi@g.o> wxGTK-2.6.1-r1.ebuild:
+  Stable on ppc.
+
+  27 Jan 2006; Mike Doty <kingtaco@g.o> wxGTK-2.6.1-r1.ebuild:
+  amd64 stable, bug 105189
+
+  27 Jan 2006; Joshua Jackson <tsunam@g.o> wxGTK-2.6.1-r1.ebuild:
+  Stable on x86; bug #105189
+
+  26 Jan 2006; Gustavo Zacarias <gustavoz@g.o> wxGTK-2.6.2-r1.ebuild:
+  Stable on sparc wrt #120333 and #105189
+
+*wxGTK-2.6.1-r1 (26 Jan 2006)
+
+  26 Jan 2006; Marcelo Goes <vanquirius@g.o>
+  +files/wxGTK-2.6.1-windowcpp.diff, +wxGTK-2.6.1-r1.ebuild:
+  2.6.1-r1 revision bump with patch for bug 105189. Fixes undefined symbol:
+  pango_x_get_context problem. Thanks to Alex Rostovtsev <tetromino at gmail
+  dot com>, Mart Raudsepp <leioat dustbite dot net>, Sander Sweers
+  <Sander.Sweers at gmail dot com> and others.
+
+  22 Jan 2006; Donnie Berkholz <spyderous@g.o>;
+  wxGTK-2.4.2-r4.ebuild:
+  Fix for modular X.
+
+  06 Dec 2005; Hanno Boeck <hanno@g.o>
+  +files/wxWidgets-2.6.2-gcc41.patch, wxGTK-2.6.2-r1.ebuild:
+  Fix for gcc 4.1.
+
+  26 Nov 2005; Karol Wojtaszek <sekretarz@g.o>
+  +files/wxGTK-2.4.2-pango_fix.patch, +wxGTK-2.4.2-r4.ebuild:
+  Fixed linking problems with pango, bug #113410
+
+  26 Nov 2005; Karol Wojtaszek <sekretarz@g.o> files/intl.cpp.diff:
+  Fixed unicode patch not to expand cvs tag
+
+*wxGTK-2.6.2-r1 (26 Nov 2005)
+
+  26 Nov 2005; Karol Wojtaszek <sekretarz@g.o> +files/intl.cpp.diff,
+  wxGTK-2.6.2.ebuild, +wxGTK-2.6.2-r1.ebuild:
+  Fixed amule and pgadmin3 crash while using broken wxGTK-2.6.2 with unicode
+  support, bug #109483 and #109218
+
+  15 Oct 2005; Jeremy Huddleston <eradicator@g.o>
+  wxGTK-2.6.2.ebuild:
+  Fixed USE=-X logic.
+
+*wxGTK-2.6.2 (11 Oct 2005)
+
+  11 Oct 2005; Rob Cakebread <pythonhead@g.o> +wxGTK-2.6.2.ebuild:
+  Version bump. Closes #106969 Removed gtk2 flag per #106560
+
+  17 Sep 2005; Aron Griffis <agriffis@g.o> wxGTK-2.6.1.ebuild:
+  Mark 2.6.1 stable on alpha
+
+  08 Sep 2005; Aron Griffis <agriffis@g.o> wxGTK-2.6.1.ebuild:
+  Mark 2.6.1 stable on ia64
+
+  06 Sep 2005; Karol Wojtaszek <sekretarz@g.o> wxGTK-2.6.1.ebuild:
+  Stable on amd64
+
+  03 Sep 2005; Markus Rothe <corsair@g.o> wxGTK-2.6.1.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@g.o> wxGTK-2.6.1.ebuild:
+  Stable on ppc.
+
+  30 Aug 2005; Gustavo Zacarias <gustavoz@g.o> wxGTK-2.6.1.ebuild:
+  Stable on sparc
+
+  28 Aug 2005; Rob Cakebread <pythonhead@g.o> wxGTK-2.6.1.ebuild:
+  Marked x86 stable
+
+*wxGTK-2.6.1 (12 Jul 2005)
+
+  12 Jul 2005; Rob Cakebread <pythonhead@g.o> +wxGTK-2.6.1.ebuild:
+  Version bump.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@g.o> wxGTK-2.4.2-r3.ebuild:
+  Stable on ppc.
+
+  06 Jun 2005; Markus Rothe <corsair@g.o> wxGTK-2.4.2-r3.ebuild:
+  Stable on ppc64
+
+  15 May 2005; Rene Nussbaumer <killerfox@g.o> wxGTK-2.4.2-r3.ebuild:
+  Stable on hppa
+
+  15 May 2005; Bryan Østergaard <kloeri@g.o> wxGTK-2.4.2-r3.ebuild:
+  Stable on alpha.
+
+  13 May 2005; Bryan Østergaard <kloeri@g.o> wxGTK-2.4.2-r3.ebuild:
+  Stable on ia64.
+
+  11 May 2005; Rob Cakebread <pythonhead@g.o> wxGTK-2.6.0-r1.ebuild:
+  Removed check for -gtk2 unicode combo since wxbase will work with that.
+  Thanks Herbie Hopkins <herbs@g.o>
+
+  11 May 2005; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.2-r3.ebuild:
+  Removed gtk USE flag.
+
+*wxGTK-2.6.0-r1 (11 May 2005)
+
+  11 May 2005; Rob Cakebread <pythonhead@g.o>
+  -files/wxGTK-2.4.2-gcc4.patch, -files/wxGTK-2.6.0-gcc4.patch,
+  -wxGTK-2.4.2-r4.ebuild, -wxGTK-2.6.0.ebuild, +wxGTK-2.6.0-r1.ebuild:
+  Removed gcc4 patch, it breaks apps bug# 91443. wxbase can now be built with
+  -gtk2 -wxgtk1 also multilib builds instead of monolithic bug# 91574
+
+  08 May 2005; Herbie Hopkins <herbs@g.o> wxGTK-2.4.2-r3.ebuild:
+  Stable on amd64.
+
+  04 May 2005; Gustavo Zacarias <gustavoz@g.o> wxGTK-2.4.2-r3.ebuild:
+  Stable on sparc
+
+  03 May 2005; Rob Cakebread <pythonhead@g.o> wxGTK-2.6.0.ebuild:
+  Enable xpm by default because wxpython needs it. bug# 91252
+
+  02 May 2005; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.2-r2.ebuild,
+  wxGTK-2.4.2-r3.ebuild, wxGTK-2.4.2-r4.ebuild:
+  Fixed odbc support for gtk2ansi. Thanks david somers <dsomers@××××××××.com>
+  bug# 83417
+
+*wxGTK-2.6.0 (02 May 2005)
+*wxGTK-2.4.2-r4 (02 May 2005)
+
+  02 May 2005; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.2-r2.ebuild,
+  wxGTK-2.4.2-r3.ebuild, +wxGTK-2.4.2-r4.ebuild, +wxGTK-2.6.0.ebuild:
+  Version bump. Marked 2.4.2-r3 stable. Added gcc4 patch bug# 89937. Thanks flameeyes for wxlib.eclass and dirtyepic@××××××××.org Ryan Hill for gcc4 fix. Changed evil no_wxgtk1 USE flag to wxgtk1
+
+  26 Mar 2005; Jeremy Huddleston <eradicator@g.o>
+  wxGTK-2.4.2-r3.ebuild, wxGTK-2.5.3.ebuild:
+  Multilib fixes and use proper toolchain compiler.
+
+  03 Mar 2005; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.2-r2.ebuild:
+  Added menu.cpp patch
+
+  03 Mar 2005; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.2-r2.ebuild:
+  Added htmlproc.h for wxruby
+
+  16 Jan 2005; Mike Frysinger <vapier@g.o> wxGTK-2.4.2-r2.ebuild,
+  wxGTK-2.4.2-r3.ebuild, wxGTK-2.5.3.ebuild:
+  Add gnuconfig since ebuild doesnt run econf for some reason.
+
+  05 Dec 2004; Rob Cakebread <pythonhead@g.o>
+  +files/wxGTK-2.4.2-menu.cpp.patch, wxGTK-2.4.2-r3.ebuild:
+  Patch to disable three private GTK+ functions. Closes bug# 46737
+
+  13 Nov 2004; Rob Cakebread <pythonhead@g.o> wxGTK-2.5.3.ebuild:
+  Removed monolithic build, fixed gtk1 detection, bug# 71036
+
+*wxGTK-2.5.3 (12 Nov 2004)
+
+  12 Nov 2004; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.2-r2.ebuild,
+  wxGTK-2.4.2-r3.ebuild, -wxGTK-2.5.1-r1.ebuild, +wxGTK-2.5.3.ebuild:
+  Version bumped, removed 2.5.1, retrofitted with SLOT's, bug# 67254
+
+*wxGTK-2.5.1-r1 (06 Nov 2004)
+
+  06 Nov 2004; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.2-r2.ebuild,
+  wxGTK-2.4.2-r3.ebuild, wxGTK-2.5.1-r1.ebuild:
+  Added filter-flags -invisibility-inlines-hidden bug# 68500
+
+  08 Sep 2004; Rob Cakebread <pythonhead@g.o> -wxGTK-2.5.1.ebuild:
+  Modified so apps can use wxwidgets eclass
+
+*wxGTK-2.4.2-r3 (02 Sep 2004)
+
+  02 Sep 2004; twp +wxGTK-2.4.2-r3.ebuild:
+  Install htmlproc.h.
+
+  18 Aug 2004; Tom Gall <tgall@g.o> wxGTK-2.4.2-r2.ebuild:
+  stable on ppc64, bug #58420
+
+*wxGTK-2.4.2-r2 (06 Aug 2004)
+
+  06 Aug 2004; Rob Cakebread <pythonhead@g.o> -wxGTK-2.4.0.ebuild,
+  -wxGTK-2.4.1-r1.ebuild, -wxGTK-2.4.2-r1.ebuild, +wxGTK-2.4.2-r2.ebuild,
+  -wxGTK-2.4.2.ebuild:
+  Removed obsolete versions and changed 2.4.2-r2 so apps can use new wxwidgets
+  eclass with multiple versions (gtk,gtk2,unicode,debug) of wxGTK installed. See
+  bug #39931
+
+  02 Aug 2004; Ferris McCormick <fmccor@g.o> wxGTK-2.4.2-r1.ebuild:
+  Stable for sparc.  Runs on sparc and is required for wxpython-2.4.2.4,
+  which is required because of some missing patches.
+
+  22 Jul 2004; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.2-r1.ebuild,
+  wxGTK-2.4.2.ebuild, wxGTK-2.5.1.ebuild:
+  Changed name from wxWindows to wxWidgets. bug# 45061
+
+  22 Jul 2004; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.1-r1.ebuild:
+  Changed name from wxwindows to wxwidgets bug# 45061
+
+  22 Jul 2004; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.0.ebuild:
+  Changed all wxwindows to wxwidgets bug# 45061
+
+  30 Jun 2004; Guy Martin <gmsoft@g.o> wxGTK-2.4.2-r1.ebuild:
+  Marked stable on hppa.
+
+  28 Jun 2004; Aron Griffis <agriffis@g.o> wxGTK-2.4.0.ebuild,
+  wxGTK-2.4.2-r1.ebuild, wxGTK-2.4.2.ebuild, wxGTK-2.5.1.ebuild:
+  econf || die, sync IUSE, glibc -> libc
+
+  23 Jun 2004; Aron Griffis <agriffis@g.o> wxGTK-2.4.0.ebuild,
+  wxGTK-2.4.1-r1.ebuild, wxGTK-2.5.1.ebuild:
+  QA - fix use invocation
+
+*wxGTK-2.4.2-r1 (22 Jun 2004)
+
+  22 Jun 2004; Rob Cakebread <pythonhead@g.o> +wxGTK-2.4.2-r1.ebuild:
+  Disable unicode for gtk. Closes bug# 52495
+
+  22 Jun 2004; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.2.ebuild:
+  Marked stable on x86
+
+*wxGTK-2.5.1 (22 Jun 2004)
+
+  22 Jun 2004; Rob Cakebread <pythonhead@g.o> +wxGTK-2.5.1.ebuild:
+  Version bump but added to package.mask. Bug# 44138. Thanks HopeSeekr
+  <theodore@×××××.org>
+
+  26 Apr 2004; Aron Griffis <agriffis@g.o> wxGTK-2.4.0.ebuild,
+  wxGTK-2.4.1-r1.ebuild, wxGTK-2.4.2.ebuild:
+  Add die following econf for bug 48950
+
+  17 Apr 2004; Daniel Ahlberg <aliz@g.o> wxGTK-2.4.1-r1.ebuild,
+  wxGTK-2.4.2.ebuild:
+  Inherit eutils, fixed IUSE flags.
+
+  24 Mar 2004; Michael Sterrett <mr_bones_@g.o> wxGTK-2.4.0.ebuild,
+  wxGTK-2.4.1-r1.ebuild:
+  don't use deprecated ? : use syntax
+
+  17 Feb 2004; Aron Griffis <agriffis@g.o> wxGTK-2.4.2.ebuild:
+  stable on ia64
+
+  17 Feb 2004; Aron Griffis <agriffis@g.o> wxGTK-2.4.0.ebuild:
+  add ~alpha for the sake of dev-python/wxPython-2.4.0.7
+
+  17 Jan 2004; Bartosch Pixa <darkspecter@g.o> :
+  manifest fix
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@g.o> wxGTK-2.4.2.ebuild:
+  set ppc in keywords
+
+  09 Jan 2004; Aron Griffis <agriffis@g.o> wxGTK-2.4.2.ebuild:
+  stable on alpha
+
+  29 Dec 2003; Guy Martin <gmsoft@g.o> wxGTK-2.4.1-r1.ebuild:
+  Marked stable on hppa.
+
+  25 Dec 2003; Jason Wever <weeve@g.o> wxGTK-2.4.1-r1.ebuild:
+  Marked stable on sparc.
+
+  14 Nov 2003; Brad House <brad_mssw@g.o> wxGTK-2.4.2.ebuild,
+  files/wxGTK-2.4.2-cleanup.patch:
+  patch from augustus@×××××××××××××.org for amd64
+
+  17 Oct 2003; Alastair Tse <liquidx@g.o> wxGTK-2.4.2.ebuild:
+  reset LANG vairable otherwise it breaks for et_EE (#30994)
+
+  09 Oct 2003; Alastair Tse <liquidx@g.o> wxGTK-2.4.1.ebuild,
+  wxGTK-2.4.2.ebuild:
+  cleanup and fixing conditionals
+
+  08 Oct 2003; Rob Cakebread <pythonhead@g.o> wxGTK-2.4.1-r1.ebuild,
+  wxGTK-2.4.1.ebuild:
+  Marked 2.4.1 and 2.4.1-r1 stable
+
+*wxGTK-2.4.2 (08 Oct 2003)
+
+  08 Oct 2003; Alastair Tse <liquidx@g.o> wxGTK-2.4.0.ebuild,
+  wxGTK-2.4.1-r1.ebuild, wxGTK-2.4.1.ebuild, wxGTK-2.4.2.ebuild,
+  files/wxGTK-2.4.2-contrib_animate.patch:
+  version bump and various fixes including png/jpeg/tiff/zlib deps (#28684) and
+  debug support (#29042) thanks to Vaclav Slavik <vaclav.slavik@××××××.cz>,
+  unicode option (#28684) thanks to Radek Podgorny <radek@××××××××.cz> and
+  finally correct licensing (#28697) thanks to Vaclav Slavik
+  <vaclav.slavik@××××××.cz> again.
+  
+  Note that unicode support is by default turned off and must be enabled
+  accompanied by the gtk2 useflag. Take care when enabling unicode because
+  many wxWindows applications do not support unicode.
+
+  04 Oct 2003; Aron Griffis <agriffis@g.o> wxGTK-2.4.1-r1.ebuild:
+  Add ~alpha to KEYWORDS
+
+*wxGTK-2.4.1-r1 (09 Sep 2003)
+
+  09 Sep 2003; Alastair Tse <liquidx@g.o> wxGTK-2.4.1-r1.ebuild,
+  files/wxGTK-2.4.1-contrib.patch:
+  now builds stuff in contrib/ like ogl and xrc
+
+  09 Jul 2003; Alastair Tse <liquidx@g.o>
+  files/wxGTK-2.4.1-wxpython1.patch, files/wxGTK-2.4.1-wxpython2.patch:
+  RCS/CVS headers spoiled patches. removed all RCS/CVS triggers from patches
+
+*wxGTK-2.4.1 (09 Jul 2003)
+
+  09 Jul 2003; Alastair Tse <liquidx@g.o> metadata.xml,
+  wxGTK-2.4.1.ebuild, files/wxGTK-2.4.1-wxpython1.patch,
+  files/wxGTK-2.4.1-wxpython2.patch:
+  new version. this one requires 2 additional patches back ported from wxPython
+  for wxPython 2.4.1.2 to compile.
+
+  07 May 2003; Alastair Tse <liquidx@g.o> wxGTK-2.4.0.ebuild:
+  disable unicode support for gtk2
+
+*wxGTK-2.4.0 (01 Jan 2003)
+
+  26 Mar 2003; Alastair Tse <liquidx@g.o> wxGTK-2.4.0.ebuild:
+  reorder gtk2 deps to make sure gtk1 and gtk2 deps are mutually exclusive
+
+  04 Feb 2003; Nick Hadaway <raker@g.o> wxGTK-2.4.0.ebuild :
+  If odbc and gtk2 are both specified, disable odbc and enable gtk2.
+  They are not compatible.
+
+  21 Jan 2003; Nick Hadaway <raker@g.o> wxGTK-2.4.0.ebuild :
+  Changed to emake.
+
+  15 Jan 2003; Nick Hadaway <raker@g.o> wxGTK-2.4.0.ebuild :
+  Marked stable.  SLOT'd back to 0.  Fixed dependancy misnomers.
+
+  07 Jan 2003; Martin Holzer <mholzer@g.o> wxGTK-2.4.0.ebuild,
+  files/digest-wxGTK-2.4.0 ChangeLog :
+  Changed to .tar.bz2. Seems to be a new release cause digest does not 
+  match old one.
+
+  01 Jan 2003; Nick Hadaway <raker@g.o> wxGTK-2.4.0.ebuild,
+  files/digest-wxGTK-2.4.0 :
+  Version bump.  Currently marked unstable.  There are problems with
+  wxGTK-2.3.4 and wxPython-2.3.4.? so I am hoping that wxPython-2.4.0.?
+  will be here soon.  Depending on the timetable I may have to bring
+  wxGTK-2.3.3 to stable.  Moved unicode configure option behind use gtk2.
+
+*wxGTK-2.3.4 (18 Dec 2002)
+
+  01 Jan 2003; Nick Hadaway <raker@g.o> wxGTK-2.3.4.ebuild :
+  Moved unicode configure option behind use gtk2.
+
+  18 Dec 2002; Mike Frysinger <vapier@g.o> :
+  Version bumpage #12380 + re-enabling support for gtk2.
+
+*wxGTK-2.3.3 (26 Oct 2002)
+
+  06 Dec 2002; Rodney Rees <manson@g.o> : changed sparc ~sparc keywords
+ 
+  05 Dec 2002; Mike Frysinger <vapier@g.o>
+  It would seem optional zlib support isnt optional ;)
+
+  28 Oct 2002; Mike Frysinger <vapier@g.o> wxGTK-2.3.3.ebuild :
+  Tweakage of USE variables and fix for #2741
+
+  26 Oct 2002; Mike Frysinger <vapier@g.o> wxGTK-2.3.3.ebuild :
+  Version bump (#9693) + pkg_setup addition (#9470)
+
+*wxGTK-2.3.2-r2 (29 Aug 2002)
+
+  26 Oct 2002; Mike Frysinger <vapier@g.o> wxGTK-2.3.2-r2.ebuild :
+  Added pkg_setup to handle zlib/zconf header files that prevented compiling.
+  Thanks to Martin Schlemmer for pkg_setup #9470
+
+  11 Sep 2002; Nick Hadaway <raker@g.o> wxGTK-2.3.2-r2.ebuild :
+  Changed optional gif support to required GIF support as you cannot
+  turn off GIF support in wxPython.  Should fix bug #7777.
+
+  29 Aug 2002; Nick Hadaway <raker@g.o> wxGTK-2.3.2-r2.ebuild,
+  files/digest-wxGTK-2.3.2-r2.ebuild, files/ledctrl.diff :
+  OpenGL 
+
+*wxGTK-2.2.9-r1 (09 Aug 2002)
+
+  30 Dec 2002; Nick Hadaway <raker@g.o> files/wxGTK-2.2.9.diff.gz :
+  Added missing joystick patch.
+
+  18 Dec 2002; Seemant Kulleen <seemant@g.o> wxGTK-2.2.9-r1.ebuild
+  files/digest-wxGTK-2.2.9-r1 :
+  This version is REQUIRED for audacity. If you are NOT the audacity or
+  wxGTK maintainer, please do NOT touch these files.
+
+  22 Aug 2002; Nick Hadaway <raker@g.o> wxGTK-2.2.9-r1.ebuild :
+  Changed to "e" tools for compiling.
+  Added some compile-time options suggested by Paul Thompson.
+
+  09 Aug 2002; Nick Hadaway <raker@g.o> wxGTK-2.2.9-r1.ebuild, 
+  files/digest-wxGTK-2.2.9-r1, files/wxGTK-2.2.9.diff.gz :
+  Thanks to Francisco Gimeno for fixing the joystick code compile problem.
+
+*wxGTK-2.3.2-r2 (13 Jun 2002) 
+
+  29 Aug 2002; Nick Hadaway <raker@g.o> wxGTK-2.3.2-r2.ebuild :
+  Removed motif comments and forced gtk as motif is no longer a supported
+  build dependancy.
+
+  25 Aug 2002; Nick Hadaway <raker@g.o> wxGTK-2.3.2-r2.ebuild :
+  Changed tiff to be a forced dependancy as wxGTK will not compile without it.
+
+  13 Aug 2002; Nick Hadaway <raker@g.o>
+  wxGTK-2.3.2-r2.ebuild :
+  Changed to econf and verified joystick patch is working.
+ 
+  15 Jul 2002; Mark Guertin <gerk@g.o>
+  Added ppc to keywords
+
+  13 Jun 2002; Bart Verwilst <verwilst@g.o> wxGTK-2.3.2-r2.ebuild : 
+   Apply a little patch to let GCC-3.1 compile this. ( src/gtk/joystick.cpp ), thanks to Francisco Gimeno <kikov@××××××××××.com>.
+  Closes bug # 3660
+
+*wxGTK-2.3.2-r1 (14 Apr 2002)
+
+  14 Apr 2002; Seemant Kulleen <seemant@g.o> wxGTK-2.3.2-r1.ebuild :
+  Cleaned up the ebuild a little bit and needs recompiling against newer libpng.
+
+*wxGTK-2.2.9 (28 Mar 2002)
+
+  28 Mar 2002; Spider <spider@g.o>; wxGTK-2.2.9.ebuild
+  Well, backported this thing to a stable branch, since hte other version is verified as working, I added this without masking anything, should be transparent except that it provides the dependency some people want.
+
+
+*wxGTK-2.3.2 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@g.o> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.

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 0000000..3636b64
--- /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
+
[phone] 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 0000000..1401b7f
--- /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-admin/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) $(__inst
 all_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 0000000..d272247
--- /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.7-mmedia.patch b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
new file mode 100644
index 0000000..3972fcb
--- /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: wxGTK-2.8.7-mmedia.patch,v 1.1 2008/01/06 22:47:55 dirtyepic Exp $
+ 
+-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-2.9.3.1-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch
new file mode 100644
index 0000000..cd6c1c1
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch
@@ -0,0 +1,77 @@
+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
+@@ -14076,10 +14076,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___depna
 me) $(__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 \
+@@ -14964,15 +14964,16 @@ 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) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+ 	for l in $(LOCALE_LINGUAS) ; do \
+ 	$(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
+@@ -138,7 +138,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
+@@ -1302,7 +1302,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
+@@ -124,7 +124,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.9.4.1-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch
new file mode 100644
index 0000000..cd0c027
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.9.4.1-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
+@@ -14774,10 +14774,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___depna
 me) $(__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 \
+@@ -15662,7 +15662,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) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -15670,7 +15670,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
+@@ -138,7 +138,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
+@@ -1302,7 +1302,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.0.0-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
new file mode 100644
index 0000000..8d508fb
--- /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___depna
 me) $(__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/metadata.xml b/x11-libs/wxGTK/metadata.xml
new file mode 100644
index 0000000..a2a4386
--- /dev/null
+++ b/x11-libs/wxGTK/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>wxwidgets</herd>
+	<maintainer>
+		<email>wxwidgets@g.o</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>
+</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 0000000..97e0bf4
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild,v 1.12 2014/05/23 08:21:26 rhill Exp $
+
+EAPI="5"
+
+inherit 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 ~x86-freebsd ~x86-interix ~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
+		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[${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.4[${MULTILIB_USEDEP},aqua=]
+		virtual/jpeg[${MULTILIB_USEDEP}]
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		)"
+
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+		X?  (
+			x11-proto/xproto[${MULTILIB_USEDEP}]
+			x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+			x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+			)"
+
+PDEPEND=">=app-admin/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
+}
+
+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 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)
+			--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
+
+	# No multilib versions for unixODBC & libgnomeprintui
+	if multilib_is_native_abi; then
+		myconf="${myconf}
+			$(use_with odbc odbc sys)"
+		if use X; then
+			myconf="${myconf}
+				$(use_with gnome gnomeprint)"
+		fi
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		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}"
+	else
+		dosym /usr/$(get_libdir)/wx/config/gtk2-unicode-release-${SLOT} /usr/bin/wx-config-${SLOT}-${ABI}
+	fi
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}

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 0000000..4985a2b
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2014 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.4 2014/05/23 08:21:26 rhill Exp $
+
+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="~amd64 ~x86"
+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[${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
+			media-libs/gst-plugins-base:0.10
+		)
+		libnotify? (
+			x11-libs/libnotify
+			amd64? (
+				app-emulation/emul-linux-x86-gtklibs
+			)
+		)
+		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		)
+	aqua? (
+		>=x11-libs/gtk+-2.4[${MULTILIB_USEDEP},aqua=]
+		virtual/jpeg[${MULTILIB_USEDEP}]
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+	X?  (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+		x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+		)"
+
+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
+
+	# https://bugs.gentoo.org/421851
+	# https://bugs.gentoo.org/499984
+	sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
+
+	epatch_user
+
+#	multilib_copy_sources
+}
+
+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
+	# 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
+			--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
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		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}"
+	else
+		dosym /usr/$(get_libdir)/wx/config/gtk2-unicode-${SLOT} /usr/bin/wx-config-${SLOT}-${ABI}
+	fi 
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}