Drop unnecessary gconf dep (bug #499416 by Nikoli).

Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 957A8463)

8 files changed, 13 insertions, 535 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index e6cb30127b49..a8ae20b83b87 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # 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.303 2014/01/08 00:28:11 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.304 2014/01/27 17:35:05 dirtyepic Exp $
+
+  27 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> 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@gentoo.org> wxGTK-3.0.0.0.ebuild:
   Stop using libgnomeprint (bug #358445) and drop now-unused gnome USE flag.
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
index 2cca3e566a28..ed6363293e3f 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.1 2013/08/10 06:07:51 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild,v 1.2 2014/01/27 17:35:05 dirtyepic Exp $
 
 EAPI="5"
 
@@ -37,7 +37,6 @@ RDEPEND="
 		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 )
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
index 9212f93c5eca..8cc764668016 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.ebuild,v 1.16 2013/10/06 09:04:16 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.17 2014/01/27 17:35:05 dirtyepic Exp $
 
 EAPI="4"
 
@@ -35,7 +35,6 @@ RDEPEND="
 		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 )
diff --git a/x11-libs/wxGTK/wxGTK-2.9.3.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.3.1-r1.ebuild
deleted file mode 100644
index 235255b7904f..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.9.3.1-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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.3.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
deleted file mode 100644
index b849e9ebcc72..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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.ebuild,v 1.7 2013/03/26 03:47:46 dirtyepic Exp $
-
-EAPI="3"
-
-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"
-
-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"
-
-SLOT="2.9"
-LICENSE="wxWinLL-3
-		GPL-2
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-collision.patch
-}
-
-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 || die "make failed."
-}
-
-# 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 || die "install failed."
-
-	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
-}
-
-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
index f552fcc834c9..850597786059 100644
--- a/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.9.4.1-r1.ebuild,v 1.1 2013/08/10 06:07:51 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild,v 1.2 2014/01/27 17:35:05 dirtyepic Exp $
 
 EAPI="5"
 
@@ -35,7 +35,6 @@ RDEPEND="
 		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 )
diff --git a/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild
deleted file mode 100644
index 0786b2c63a47..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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.ebuild,v 1.4 2013/03/26 03:47:46 dirtyepic Exp $
-
-EAPI="4"
-
-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"
-
-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"
-
-SLOT="2.9"
-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
-}
-
-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
-}
-
-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
index e49bd8de92d0..4ae675fb62c8 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2014/01/08 00:28:11 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild,v 1.3 2014/01/27 17:35:05 dirtyepic Exp $
 
 EAPI="5"
 
@@ -33,7 +33,6 @@ RDEPEND="
 		x11-libs/libXxf86vm
 		x11-libs/pango[X]
 		gstreamer? (
-			gnome-base/gconf:2
 			media-libs/gstreamer:0.10
 			media-libs/gst-plugins-base:0.10 )
 		libnotify? ( x11-libs/libnotify )