--- /usr/portage/dev-util/motor/motor-3.4.0-r2.ebuild	2008-12-23 19:46:51.000000000 +0200
+++ motor-3.4.0-r2.ebuild	2009-07-08 14:58:01.000000000 +0300
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/motor/motor-3.4.0-r2.ebuild,v 1.1 2008/12/23 17:46:51 mpagano Exp $
 
+EAPI=2
+
 inherit eutils
 
 DESCRIPTION="text mode based programming environment for Linux"
@@ -16,16 +18,15 @@
 DEPEND=">=sys-libs/ncurses-5.2
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/motor-3.2.2-security.patch"
 	epatch "${FILESDIR}/motor-${PV}-gcc43.patch"
+	sed -i -e 's/strndup/motorown_strndup/' \
+		 parser/include/strfn.h parser/src/strfn.c parser/src/parser.c
 }
 
-src_compile() {
+src_configure() {
 	econf `use_enable nls` || die
-	emake || die
 }
 
 src_install() {