--- emech-3.0.2.ebuild	2013-03-26 21:15:39.989282517 +0100
+++ emech-3.0.2.ebuild	2013-03-26 21:11:52.778926649 +0100
@@ -2,28 +2,29 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-irc/emech/emech-3.0.2.ebuild,v 1.6 2009/06/06 21:45:19 cla Exp $
 
-inherit toolchain-funcs
+EAPI="5"
+
+inherit eutils
 
 DESCRIPTION="The EnergyMech is a UNIX compatible IRC bot programmed in the C language"
 HOMEPAGE="http://www.energymech.net/"
 SRC_URI="http://www.energymech.net/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86 ~amd64"
+KEYWORDS="ppc x86"
 IUSE="debug session tcl"
 
 DEPEND=""
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	sed -i \
 		-e 's: "help/":"/usr/share/energymech/help/":' \
 		-e 's: "messages/":"/usr/share/energymech/messages/":' \
 		"${S}"/src/config.h.in
 }
 
-src_compile() {
+src_configure() {
 	./configure \
 		--with-alias \
 		--with-botnet \
@@ -53,19 +54,22 @@ 
 		$(use_with session) \
 		$(use_with debug) \
 		|| die "./configure failed"
-	emake -C src CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" || die "emake failed"
 }
 
-src_install() {
-	dobin src/energymech || die "dobin failed"
+src_compile() {
+	emake -C src CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" LFLAGS="${LDFLAGS}"
+}
 
+src_install() {
+	dobin src/energymech
+	
 	insinto /usr/share/energymech/help
-	doins help/* || die "doins failed"
+	doins help/*
 
 	insinto /usr/share/energymech/messages
-	doins messages/*.txt || die "doins failed"
+	doins messages/*.txt
 
-	dodoc sample.* README* TODO VERSIONS CREDITS checkmech || die "dodoc failed"
+	dodoc sample.* README* TODO VERSIONS CREDITS checkmech
 }
 
 pkg_postinst() {