Index: codeblocks-1.0_rc2.ebuild
===================================================================
--- codeblocks-1.0_rc2.ebuild	(revision 107)
+++ codeblocks-1.0_rc2.ebuild	(revision 109)
@@ -1,4 +1,4 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -27,17 +27,22 @@
 	>=sys-devel/autoconf-2.5.0
 	>=sys-devel/automake-1.7
 	>=sys-devel/libtool-1.4"
+WX_GTK_VER="2.6"
 
 pkg_setup() {
-	if ! built_with_use x11-libs/wxGTK gtk2; then
-		die "Build x11-libs/wxGTK with USE=gtk2."
+	if use unicode ; then
+		need-wxwidgets gtk2
+		need-wxwidgets unicode
+	else
+		need-wxwidgets gtk2
 	fi
 }
 
+S="${WORKDIR}/${MY_P}"
 src_unpack() {
-	unpack ${MY_P}.tgz
-	cd ${WORKDIR}/${MY_P} || die "cd failed"
-	epatch ${FILESDIR}/${P}.patch
+	unpack "${A}"
+	cd "${S}" || die "cd failed"
+	epatch "${FILESDIR}/${P}.patch"
 }
 
 src_compile() {
@@ -50,10 +55,10 @@
 
 	edos2unix src/setup/mime/codeblocks.desktop src/setup/mime/codeblocks.applications
 
-	./configure --prefix=/usr --with-wx-config=wx-config-2.6 || die "Configure failed"
+	econf --prefix=/usr --with-wx-config=wx-config-2.6 || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	einstall || die "einstall failed"
+	make DESTDIR="${D}" install || die "make install failed"
 }