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.

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

5 files changed, 565 insertions, 10 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index c9edc4b03c95..ef7fe63dd7e1 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.299 2013/03/26 03:47:46 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.300 2013/08/10 06:07:51 dirtyepic Exp $
+
+*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@gentoo.org> +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@gentoo.org> wxGTK-2.9.3.1.ebuild,
   wxGTK-2.9.4.1.ebuild:
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 943685f3851d..3b854ba03ab5 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -13,19 +13,22 @@ DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e94
 DIST wxPython-src-2.9.3.1.tar.bz2 49131100 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d SHA512 16e5be3a2a98d64637866ecae7afb3a2835d21684077bb8a1b87d3c0cf37b75eb1169f3b8e16e38c5b85c04cce974dbfd5ba25d3d0a3016a47c005a05e5dbfc5 WHIRLPOOL ccae768ff87a95ee88d6259821be5e2073928278155743c0c16c75dd9b2262ac49ccb322dd4aa77ccfdac12d7de0e874a92b41171adacfa26ffb216f170751a7
 DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
 DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
+EBUILD wxGTK-2.8.12.1-r1.ebuild 4295 SHA256 8d5e13ac199a327ad4049d39fbe01eca9abb290b229ebe0c0efabd55e9d26bb9 SHA512 948b3601041aa1e96828d9323540390d558ef945d1c7a27b858ebd4d9e3edd9287e5e1179e75ae8656d9a621b01a0812032c38ca84f68b94885a2bea92457337 WHIRLPOOL 080cee6b394c1981dd8a6f1b2e55959b154330bf5b58f6b52f77f57cf29899c264928d5622ce7ed3d6cb53c7421049fccddbae3a6ac9a64aecee126e64982308
 EBUILD wxGTK-2.8.12.1.ebuild 4115 SHA256 aa81865193740be0455ed613ae39a112bb6622ea50bc36023d72693d5c8d7022 SHA512 5e401e0dd2702d2e74ce43992a6b6e0147d43852273eb929bdae231fd05f30b18c51581e535fb1377fa405aac9d5277eb18d6266f2e25fb90d3b463ffb5ba467 WHIRLPOOL 8781c3976aa543d91e6dd0fe0c69b23cd04db6601d98786ec5e3d0b530594090d8bc23826fc90efdbb93696e229bb5ecf283dec5388435600807f080daf8736a
+EBUILD wxGTK-2.9.3.1-r1.ebuild 4343 SHA256 8950007d509129e13637e43a1509529cf1dd60ea754d1700121a3f787df74342 SHA512 f049ec56e516b0d7d9fb11352abc67aa50190a875efdd0792501fc0f38ff093f7ccc1fc729dd7703d131027cf3cac9c71c3dea9b16b66b138f84959198edac52 WHIRLPOOL 5f88cf9423ce8c2ebcb2069f9bb908e63ac12b463c1bc749818a0607403b5cd09bbfcd8b0795eaaa86171be02b0adb3b0a283d91616e9910a79550ec558baee6
 EBUILD wxGTK-2.9.3.1.ebuild 4220 SHA256 ff5dff0eebef2475ce2f1ced22bbb3a2a40b401154ed88435762477c913efc99 SHA512 8a4a40913e192437fc249219677aa844e454aefc9f27986152d927ecc0c57456ce091a24939dc4b5381cda7956bcac017f1cfb61193a5dbf52225517e2862147 WHIRLPOOL a162b95fc4196247034a4f0ea45eb2d71fd631b5858321a4ef619e69e3572baac1ae3c1e1e1f3d6b4db871b3ad58b9092aa81e3ec0324f0293582703b4e2f710
+EBUILD wxGTK-2.9.4.1-r1.ebuild 4451 SHA256 0cc04fa5ba5fcc4f04bba0066361662252abd420529b4ad0f441aadf307648a9 SHA512 6aa0e75c2de89748d9da4b0e961142b89c640b8b40d2f88a6f162746f0bdfec56a77b8e60ec6b3efe20bd25840281eabd1e1e167b9e69faab12a944b1a302f7b WHIRLPOOL 90c1e88b6dd54a5059ce4bb642b60af5d34816e844670fd945141439d26bc43f90b04227ac7dd1251dc7ba28ba08cf68047fecf4f0bbec30f66a54f71a9ad8d3
 EBUILD wxGTK-2.9.4.1.ebuild 4281 SHA256 6245bdd415bc6477f414558b2a6ba066b387a30975850b496d1037c50d0a59cb SHA512 116b7544587ff15dea61f91ad6f23b490e634652c0ed59cb874c113a712757fa0f47d1cd1a4cb7b0527944c55e8a48a16c05c8ba63efe66e64b10f69a674e4fd WHIRLPOOL 51bd6c735a49d0b4f6324c6fffef1d900b140f13d4867dbc12eff8718a3be125cc77a0dc705e6da03b6c40c07cff9fbe42351742b15fa8ca7939f838c8565446
-MISC ChangeLog 46968 SHA256 4a5ffc724ff410a2f61de70f5043a286cfc7453b21da640108ea75e2c0e59443 SHA512 09b640f792800ce1217d91512a526d3dace44034c5b5daae22c3bb4c7de6d5a5faed2ed5eb57ac7525de0bdf13e2d30054e825eac992d5dc57eeab5d27e70f49 WHIRLPOOL 9b1616e451a1cc98f21ecdaecfab0573450a46d3f65d88c45a33238759c6bf88a4743c519a1624e8665e9860f0f69a1a4107a79bbe164671c8312902760f0beb
+MISC ChangeLog 47347 SHA256 7927a0dcb0ecef95ff5ced70d5d722167c48179ed96ae877fe4c20d92f40b68a SHA512 45d6684b6964044888f354f870c4272bcf9fbe948f8cbf2369568f546fef973b046855aa1397299c8845cd24cb4f3f02c6e57196d29f6d50d8029a2239fb0353 WHIRLPOOL 501dff6bd3e60425318467b59196b089b0df960289035e8f416b828bb1cba0a411bbc6451e25651f266e84fdfe579eb4e499d3d1d5c67e22bd01430580fe09f7
 MISC metadata.xml 670 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75 SHA512 37ec56d00b488857a285a61c894f8c28dde61efce48d79b7767a207f5c533ad01f2ef09ebecc98dd5b803b4545e1d7f513ffb48e5ead4818ecb607129339c907 WHIRLPOOL cbcc9d2aea988f0b8e1a0615918903cf332976b192156296051c9f5ac5563e9ab512376453a52ad02db0fe3465b9b30d88d6808e38bea52bb58abe6fed316586
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRURzpAAoJEO04vUmVeoRjepQIAKyHYAsfSvxh7xjeUY3afvlK
-jIQJY6BZTcmykOVh0YYgCd/7ClJGoonibfVsz1KCw7sorGae/rFHBgAL5pIYOdvG
-MNwCP/Y4bQh+Q2Ii6B1/T6bE4ByQyB2N7tk9dIXjDv1iauuJhU1EKKRQLmpLu+7c
-JYg68LJUNkDMP/crQCcZH9m/gpGw0O6jCXrIlOvejs6cWMw4YN0vsEw1VIbldftV
-Gof7Xz7MPF3gdvat3Mt1TefwfASer8D/B++VVgQjVelgs5BEKL3EhPN0mckSUrsH
-ndhIlPlGSU/IU0xE/k0QIXaHvCafTC4ehZ31Zf3qCHwyZ5s2O3R9SbaQoU7hR9M=
-=cDId
+iQEcBAEBCAAGBQJSBds4AAoJEO04vUmVeoRj4NcIAIN8CDtWUCWHWq/zIu35iFO5
+iNN/2H1CRjM+ef7WtiPd1fqOpkAPfM8BrBbiV6O3RlKSO7kQHxxHPKhYp2ilas2w
+L0aDJyLMY6OZQDiUhoAQuI9XCJJ2/IyiflzEDofFJK5KaUuy1BC0Ghp8dr6TgrIk
+v41vp/qRpOrV7DX9jfPHmGrzx+PUtR1RlkWuIZ1zc6uZOZfZjok4+ejESOWYSJrl
+f2VxRvvsSshbkS7rbpvhVl7wSkQIDh/xEnjHJB78WcrSS5akdqfv4BaOv0aI5ew1
+EK/pSqhEqQBRXizbnUs3drTv7p7DaxzMKhuA6FzZ1qHKc5XfPlcFIYkYhEsgvYo=
+=HcVt
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
new file mode 100644
index 000000000000..2cca3e566a28
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild,v 1.1 2013/08/10 06:07:51 dirtyepic Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib versionator
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+BASE_PV="$(get_version_component_range 1-3)"
+BASE_P="${PN}-${BASE_PV}"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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
+			media-libs/gst-plugins-base:0.10 )
+		opengl? ( virtual/opengl )
+		tiff?   ( media-libs/tiff:0 )
+		)
+	aqua? (
+		>=x11-libs/gtk+-2.4[aqua=]
+		virtual/jpeg
+		tiff?   ( media-libs/tiff:0 )
+		)"
+
+DEPEND="${RDEPEND}
+		virtual/pkgconfig
+		opengl? ( virtual/glu )
+		X?  (
+			x11-proto/xproto
+			x11-proto/xineramaproto
+			x11-proto/xf86vidmodeproto
+			)"
+
+PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		odbc?	( LGPL-2 )
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
+	epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
+	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
+	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
+
+	# x32 https://bugs.gentoo.org/421851
+	sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
+
+	# prefix https://bugs.gentoo.org/394123
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" \
+		-e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \
+		configure || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-compat26
+			--enable-shared
+			--enable-unicode
+			--with-regex=builtin
+			--with-zlib=sys
+			--with-expat=sys
+			$(use_enable debug)
+			$(use_enable pch precomp-headers)
+			$(use_with odbc odbc sys)
+			$(use_with sdl)
+			$(use_with tiff libtiff sys)"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			$(use_enable gstreamer mediactrl)
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			--without-gnomevfs"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	mkdir "${S}"/wxgtk_build
+	cd "${S}"/wxgtk_build
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+	cd "${S}"/wxgtk_build
+
+	emake
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src
+		emake
+	fi
+}
+
+src_install() {
+	cd "${S}"/wxgtk_build
+
+	emake DESTDIR="${D}" install
+
+	if [[ -d contrib/src ]]; then
+		cd contrib/src
+		emake DESTDIR="${D}" install
+	fi
+
+	cd "${S}"/docs
+	dodoc changes.txt readme.txt todo30.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dohtml -r "${S}"/docs/html/*
+	fi
+
+	# Stray windows locale file, causes collisions
+	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-2.9.3.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.3.1-r1.ebuild
new file mode 100644
index 000000000000..235255b7904f
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.9.3.1-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.3.1-r1.ebuild,v 1.1 2013/08/10 06:07:51 dirtyepic Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gnome gstreamer opengl pch sdl tiff webkit"
+
+SLOT="2.9/2.9.3"
+
+RDEPEND="
+	dev-libs/expat
+	sdl?    ( media-libs/libsdl )
+	X?  (
+		>=dev-libs/glib-2.22:2
+		media-libs/libpng:0=
+		sys-libs/zlib
+		virtual/jpeg
+		>=x11-libs/gtk+-2.18:2
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		gnome? ( gnome-base/libgnomeprintui:2.2 )
+		gstreamer? (
+			gnome-base/gconf:2
+			media-libs/gstreamer:0.10
+			media-libs/gst-plugins-base:0.10 )
+		opengl? ( virtual/opengl )
+		tiff?   ( media-libs/tiff:0 )
+		webkit? ( net-libs/webkit-gtk:2 )
+		)
+	aqua? (
+		>=x11-libs/gtk+-2.4[aqua=]
+		virtual/jpeg
+		tiff?   ( media-libs/tiff:0 )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	opengl? ( virtual/glu )
+	X?  (
+		x11-proto/xproto
+		x11-proto/xineramaproto
+		x11-proto/xf86vidmodeproto
+		)"
+#	test? ( dev-util/cppunit )
+
+PDEPEND=">=app-admin/eselect-wxwidgets-1.4"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-collision.patch
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-compat26
+			--with-zlib=sys
+			--with-expat=sys
+			$(use_enable pch precomp-headers)
+			$(use_with sdl)"
+
+	# debug in >=2.9
+	#   if USE="debug" set max debug level (wxDEBUG_LEVEL=2)
+	#   if USE="-debug" use the default (wxDEBUG_LEVEL=1)
+	#   do not use --disable-debug
+	# this means we always build debugging features into the library, and
+	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+	# http://docs.wxwidgets.org/2.9/overview_debugging.html
+	# http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+	use debug \
+		&& myconf="${myconf} --enable-debug=max"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--without-gnomevfs
+			$(use_enable gstreamer mediactrl)
+			$(use_enable webkit webview)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			$(use_with !gnome gtkprint)
+			$(use_with tiff libtiff sys)"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	mkdir "${S}"/wxgtk_build
+	cd "${S}"/wxgtk_build
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+	cd "${S}"/wxgtk_build
+	emake
+}
+
+# Currently fails - need to investigate
+#src_test() {
+#	cd "${S}"/wxgtk_build/tests
+#	emake || die "failed building testsuite"
+#	./test -d || ewarn "failed running testsuite"
+#}
+
+src_install() {
+	cd "${S}"/wxgtk_build
+
+	emake DESTDIR="${D}" install
+
+	cd "${S}"/docs
+	dodoc changes.txt readme.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dohtml -r "${S}"/docs/doxygen/out/html/*
+	fi
+
+	# Stray windows locale file, causes collisions
+	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild
new file mode 100644
index 000000000000..f552fcc834c9
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild,v 1.1 2013/08/10 06:07:51 dirtyepic Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-2.9.4.0.tar.bz2
+	doc? ( mirror://sourceforge/wxpython/wxPython-docs-2.9.4.0.tar.bz2 )
+	mirror://sourceforge/wxpython/wxPython-src-${PV}.patch"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gnome gstreamer opengl pch sdl tiff webkit"
+
+SLOT="2.9/2.9.4"
+
+RDEPEND="
+	dev-libs/expat
+	sdl?    ( media-libs/libsdl )
+	X?  (
+		>=dev-libs/glib-2.22:2
+		media-libs/libpng:0=
+		sys-libs/zlib
+		virtual/jpeg
+		>=x11-libs/gtk+-2.18:2
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		gnome? ( gnome-base/libgnomeprintui:2.2 )
+		gstreamer? (
+			gnome-base/gconf:2
+			media-libs/gstreamer:0.10
+			media-libs/gst-plugins-base:0.10 )
+		opengl? ( virtual/opengl )
+		tiff?   ( media-libs/tiff:0 )
+		webkit? ( net-libs/webkit-gtk:2 )
+		)
+	aqua? (
+		>=x11-libs/gtk+-2.4[aqua=]
+		virtual/jpeg
+		tiff?   ( media-libs/tiff:0 )
+		)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	opengl? ( virtual/glu )
+	X?  (
+		x11-proto/xproto
+		x11-proto/xineramaproto
+		x11-proto/xf86vidmodeproto
+		)"
+#	test? ( dev-util/cppunit )
+
+PDEPEND=">=app-admin/eselect-wxwidgets-1.4"
+
+LICENSE="wxWinLL-3
+		GPL-2
+		doc?	( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-2.9.4.0"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-collision.patch
+	epatch "${DISTDIR}"/wxPython-src-${PV}.patch
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-compat26
+			--with-zlib=sys
+			--with-expat=sys
+			$(use_enable pch precomp-headers)
+			$(use_with sdl)"
+
+	# debug in >=2.9
+	#   if USE="debug" set max debug level (wxDEBUG_LEVEL=2)
+	#   if USE="-debug" use the default (wxDEBUG_LEVEL=1)
+	#   do not use --disable-debug
+	# this means we always build debugging features into the library, and
+	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+	# http://docs.wxwidgets.org/2.9/overview_debugging.html
+	# http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+	use debug \
+		&& myconf="${myconf} --enable-debug=max"
+
+	# wxGTK options
+	#   --enable-graphics_ctx - needed for webkit, editra
+	#   --without-gnomevfs - bug #203389
+	use X && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--without-gnomevfs
+			$(use_enable gstreamer mediactrl)
+			$(use_enable webkit webview)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			$(use_with !gnome gtkprint)
+			$(use_with tiff libtiff sys)"
+
+	use aqua && \
+		myconf="${myconf}
+			--enable-graphics_ctx
+			--enable-gui
+			--with-libpng=sys
+			--with-libxpm=sys
+			--with-libjpeg=sys
+			--with-mac
+			--with-opengl"
+			# cocoa toolkit seems to be broken
+
+	# wxBase options
+	if use !X && use !aqua ; then
+		myconf="${myconf}
+			--disable-gui"
+	fi
+
+	mkdir "${S}"/wxgtk_build
+	cd "${S}"/wxgtk_build
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+	cd "${S}"/wxgtk_build
+	emake
+}
+
+# Currently fails - need to investigate
+#src_test() {
+#	cd "${S}"/wxgtk_build/tests
+#	emake || die "failed building testsuite"
+#	./test -d || ewarn "failed running testsuite"
+#}
+
+src_install() {
+	cd "${S}"/wxgtk_build
+
+	emake DESTDIR="${D}" install
+
+	cd "${S}"/docs
+	dodoc changes.txt readme.txt
+	newdoc base/readme.txt base_readme.txt
+	newdoc gtk/readme.txt gtk_readme.txt
+
+	if use doc; then
+		dohtml -r "${S}"/docs/doxygen/out/html/*
+	fi
+
+	# Stray windows locale file, causes collisions
+	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}