--- hfsutils-3.2.6-r5.ebuild.orig	2009-09-11 11:34:55.000000000 +0000
+++ hfsutils-3.2.6-r5.ebuild	2013-01-11 13:37:18.024000001 +0000
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild,v 1.5 2009/09/11 11:34:55 flameeyes Exp $
 
+EAPI=5
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="HFS FS Access utils"
@@ -17,35 +19,31 @@
 		tk? ( dev-lang/tk )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+# use tk requires tcl - bug #150437
+REQUIRED_USE="tk? ( tcl )"
+
+src_prepare() {
 	epatch "${FILESDIR}"/hfsutils-3.2.6-errno.patch
 	epatch "${FILESDIR}"/largerthan2gb.patch
+	epatch "${FILESDIR}"/hfsutils-3.2.6-fix-tcl-8.6.patch
+}
+
+src_configure() {
+	econf $(use_with tcl) $(use_with tk)
 }
 
 src_compile() {
-	tc-export CC CPP LD RANLIB
-	### use tk implies --with-tcl - bug #150437
-	if use tk; then
-		econf --with-tcl --with-tk || die
-	else
-		econf \
-			$(use_with tcl) \
-			$(use_with tk) \
-			|| die
-	fi
-	emake PREFIX=/usr MANDIR=/usr/share/man || die
-	emake -C hfsck PREFIX=/usr MANDIR=/usr/share/man || die
+	emake AR="$(tc-getAR) rc" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
+	emake CC="$(tc-getCC)" -C hfsck
 }
 
 src_install() {
 	dodir /usr/bin /usr/lib /usr/share/man/man1
-	make \
+	emake \
 		prefix="${D}"/usr \
 		MANDEST="${D}"/usr/share/man \
 		infodir="${D}"/usr/share/info \
-		install || die
-	dobin hfsck/hfsck || die
+		install
+	dobin hfsck/hfsck
 	dodoc BLURB CHANGES README TODO doc/*.txt
 }