Index: plplot-5.9.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.5.ebuild,v
--- plplot-5.9.5.ebuild	4 Nov 2009 14:21:08 -0000	1.1
+++ plplot-5.9.5.ebuild	25 Nov 2009 06:04:02 -0000
@@ -14,7 +14,7 @@ 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ada cairo doc examples fortran gd gnome java jpeg latex octave
-	 pdf perl png python qhull svg svga tcl threads tk truetype wxwindows X"
+	 pdf perl png python qhull svg svga tcl threads tk truetype wxwidgets X"
 
 RDEPEND="ada? ( virtual/gnat )
 	cairo? ( x11-libs/cairo[svg?,X?] )
@@ -34,7 +34,7 @@ 
 	truetype? ( media-fonts/freefont-ttf
 				media-libs/lasi
 				gd? ( media-libs/gd[truetype] ) )
-	wxwindows? ( x11-libs/wxGTK:2.8[X] x11-libs/agg )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg )
 	X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )"
 
 DEPEND="${RDEPEND}
@@ -58,8 +58,6 @@ 
 		fortran_pkg_setup
 	fi
 	export FC=${FORTRANC} F77=${FORTRANC}
-
-	wxwidgets_pkg_setup
 }
 
 src_prepare() {
@@ -112,7 +110,8 @@ 
 		$(cmake-utils_use_enable tcl itcl)
 		$(cmake-utils_use_enable tk tk)
 		$(cmake-utils_use_enable tk itk)
-		$(cmake-utils_use_enable wxwindows wxwidgets)
+		$(cmake-utils_pld wxwidgets _wxwidgets)
+		$(cmake-utils_pld wxwidgets _wxpng)
 		$(cmake-utils_pld pdf pdf)
 		$(cmake-utils_pld truetype psttf)
 		$(cmake-utils_pld latex pstex)