Index: gnuplot-4.2.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild,v
retrieving revision 1.3
diff -u -r1.3 gnuplot-4.2.5-r1.ebuild
--- gnuplot-4.2.5-r1.ebuild	1 Aug 2009 12:08:20 -0000	1.3
+++ gnuplot-4.2.5-r1.ebuild	7 Aug 2009 21:25:10 -0000
@@ -3,7 +3,6 @@
 # $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild,v 1.3 2009/08/01 12:08:20 bicatali Exp $
 
 EAPI=2
-WX_GTK_VER="2.8"
 
 inherit autotools elisp-common eutils multilib wxwidgets
 
@@ -36,7 +35,7 @@
 	svga? ( media-libs/svgalib )
 	readline? ( >=sys-libs/readline-4.2 )
 	plotutils? ( media-libs/plotutils )
-	wxwidgets? ( =x11-libs/wxGTK-2.8*
+	wxwidgets? ( x11-libs/wxGTK:2.8[X]
 		>=x11-libs/cairo-0.9
 		>=x11-libs/pango-1.10.3
 		>=x11-libs/gtk+-2.8 )"
@@ -47,11 +46,12 @@
 E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="/usr/share/texmf-site"
 
-pkg_setup() {
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
 src_prepare() {
+	if use wxwidgets; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+	fi
+
 	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216
 	epatch "${FILESDIR}"/${PN}-4.2.3-app-defaults.patch #219323
 	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch #201871