Version bump, remove old.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

6 files changed, 31 insertions, 389 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index a91eddc84258..ab742fd15c4b 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.291 2012/05/31 13:25:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.292 2012/07/28 22:45:58 dirtyepic Exp $
+
+*wxGTK-2.9.4.1 (28 Jul 2012)
+
+  28 Jul 2012; Ryan Hill <dirtyepic@gentoo.org>
+  -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@gentoo.org> wxGTK-2.8.12.1.ebuild:
   Correct searchpath to be sane on prefix without influence on plain
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-libpng15.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-libpng15.patch
deleted file mode 100644
index 56abde593155..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-2.8.11-libpng15.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
-index 7891ff8..197bda5 100644
---- a/src/common/imagpng.cpp
-+++ b/src/common/imagpng.cpp
-@@ -529,7 +529,7 @@ wxPNGHandler::LoadFile(wxImage *image,
-     png_structp png_ptr = png_create_read_struct
-                           (
-                             PNG_LIBPNG_VER_STRING,
--                            (voidp) NULL,
-+                            NULL,
-                             wx_png_error,
-                             wx_png_warning
-                           );
-@@ -586,16 +586,18 @@ wxPNGHandler::LoadFile(wxImage *image,
- #if wxUSE_PALETTE
-     if (color_type == PNG_COLOR_TYPE_PALETTE)
-     {
--        const size_t ncolors = info_ptr->num_palette;
-+        int ncolors = 0;
-+        png_colorp palette;
-+        png_get_PLTE( png_ptr, info_ptr, &palette, &ncolors);
-         unsigned char* r = new unsigned char[ncolors];
-         unsigned char* g = new unsigned char[ncolors];
-         unsigned char* b = new unsigned char[ncolors];
- 
-         for (size_t j = 0; j < ncolors; j++)
-         {
--            r[j] = info_ptr->palette[j].red;
--            g[j] = info_ptr->palette[j].green;
--            b[j] = info_ptr->palette[j].blue;
-+            r[j] = palette[j].red;
-+            g[j] = palette[j].green;
-+            b[j] = palette[j].blue;
-         }
- 
-         image->SetPalette(wxPalette(ncolors, r, g, b));
diff --git a/x11-libs/wxGTK/files/wxGTK-2.9.1.1-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch
index 8d053fda5e05..cd0c0271e4b7 100644
--- a/x11-libs/wxGTK/files/wxGTK-2.9.1.1-collision.patch
+++ b/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch
@@ -5,34 +5,34 @@ Prevent file collisions between multiple installed SLOTs.
     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 find it.
+  - Version wxstd.mo and modify AddStdCatalog to use it.
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -13464,10 +13464,9 @@ 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) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+@@ -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___depname) $(__cocoa_res___depname)
  
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_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: $(__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 \
++	(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 \
-@@ -14310,7 +14309,8 @@ install-wxconfig:
+@@ -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) ../lib/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))
+-	(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
-@@ -14318,7 +14318,7 @@ locale_install:
+@@ -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 \
@@ -65,7 +65,7 @@ Prevent file collisions between multiple installed SLOTs.
      // there may be a catalog with toolkit specific overrides, it is not
 --- a/utils/wxrc/Makefile.in
 +++ b/utils/wxrc/Makefile.in
-@@ -120,7 +120,6 @@ distclean: clean
+@@ -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)
diff --git a/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
deleted file mode 100644
index 237c0fc7b1e2..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild,v 1.15 2012/05/05 03:52:23 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils versionator flag-o-matic
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="http://wxwidgets.org/"
-
-BASE_PV="$(get_version_component_range 1-3)"
-BASE_P="${PN}-${BASE_PV}"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# 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 ~x86-fbsd"
-IUSE="X doc debug gnome gstreamer odbc opengl pch sdl tiff"
-
-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 )
-		opengl? ( virtual/opengl )
-		tiff?   ( media-libs/tiff:0 )
-		)"
-
-DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		X?  (
-			x11-proto/xproto
-			x11-proto/xineramaproto
-			x11-proto/xf86vidmodeproto
-			)"
-
-PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
-
-SLOT="2.8"
-LICENSE="wxWinLL-3
-		GPL-2
-		odbc?	( LGPL-2 )
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
-	epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
-	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
-	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
-	epatch "${FILESDIR}"/${PN}-2.8.11-libpng15.patch           # Bug #355035
-}
-
-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"
-
-	# wxBase options
-	use X || \
-		myconf="${myconf}
-			--disable-gui"
-
-	mkdir "${S}"/wxgtk_build
-	cd "${S}"/wxgtk_build
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-src_compile() {
-	cd "${S}"/wxgtk_build
-
-	emake || die "make failed."
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src
-		emake || die "make contrib failed."
-	fi
-}
-
-src_install() {
-	cd "${S}"/wxgtk_build
-
-	emake DESTDIR="${D}" install || die "install failed."
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src
-		emake DESTDIR="${D}" install || die "install contrib failed."
-	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
-
-	# We don't want this
-	rm "${D}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo
-}
-
-pkg_postinst() {
-	has_version app-admin/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-admin/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild
deleted file mode 100644
index 35e0c6a9fdfa..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2012 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.0.ebuild,v 1.6 2012/05/05 03:52:23 jdhore Exp $
-
-EAPI="3"
-
-inherit eutils versionator flag-o-matic
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="http://wxwidgets.org/"
-
-BASE_PV="$(get_version_component_range 1-3)"
-BASE_P="${PN}-${BASE_PV}"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# 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 ~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"
-
-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
-		X?  (
-			x11-proto/xproto
-			x11-proto/xineramaproto
-			x11-proto/xf86vidmodeproto
-			)"
-
-PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
-
-SLOT="2.8"
-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
-}
-
-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 || die "make failed."
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src
-		emake || die "make contrib failed."
-	fi
-}
-
-src_install() {
-	cd "${S}"/wxgtk_build
-
-	emake DESTDIR="${D}" install || die "install failed."
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src
-		emake DESTDIR="${D}" install || die "install contrib failed."
-	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
-
-	# We don't want this
-	rm "${ED}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo
-}
-
-pkg_postinst() {
-	has_version app-admin/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-admin/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild
index bb073883a370..95df279452f5 100644
--- a/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild,v 1.8 2012/05/05 03:52:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild,v 1.1 2012/07/28 22:45:58 dirtyepic Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils flag-o-matic
 
@@ -11,8 +11,9 @@ 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 )"
+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"
@@ -45,13 +46,13 @@ RDEPEND="
 		)"
 
 DEPEND="${RDEPEND}
+	dev-util/cppunit
 	virtual/pkgconfig
 	X?  (
 		x11-proto/xproto
 		x11-proto/xineramaproto
 		x11-proto/xf86vidmodeproto
 		)"
-#		test? ( dev-util/cppunit )
 
 PDEPEND=">=app-admin/eselect-wxwidgets-1.4"
 
@@ -60,11 +61,11 @@ LICENSE="wxWinLL-3
 		GPL-2
 		doc?	( wxWinFDL-3 )"
 
-S="${WORKDIR}/wxPython-src-${PV}"
+S="${WORKDIR}/wxPython-src-2.9.4.0"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-collision.patch
-	epatch "${FILESDIR}"/${PN}-2.8.11-libpng15.patch
+	epatch "${DISTDIR}"/wxPython-src-${PV}.patch
 }
 
 src_configure() {
@@ -134,7 +135,7 @@ src_configure() {
 
 src_compile() {
 	cd "${S}"/wxgtk_build
-	emake || die "make failed."
+	emake
 }
 
 # Currently fails - need to investigate
@@ -147,7 +148,7 @@ src_compile() {
 src_install() {
 	cd "${S}"/wxgtk_build
 
-	emake DESTDIR="${D}" install || die "install failed."
+	emake DESTDIR="${D}" install
 
 	cd "${S}"/docs
 	dodoc changes.txt readme.txt