--- net-dns/host/host-20070128.ebuild	2009-09-23 20:36:33.000000000 +0200
+++ net-dns/host/host-20070128.ebuild	2010-03-12 19:03:41.874673548 +0100
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-dns/host/host-20070128.ebuild,v 1.7 2009/09/23 18:29:05 patrick Exp $
 
+EAPI="2"
 inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="A powerful command-line DNS query and test tool implementing many additional protocols"
@@ -13,35 +14,22 @@
 KEYWORDS="~alpha ~amd64 hppa ~ppc ~sparc ~x86"
 IUSE="debug"
 
+# Bug 91515
 RESTRICT="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use debug; then
-		sed -i -e "/^CDEBUG/d" \
-			-e "/^DEBUGDEFS/d" \
-			Makefile || die "src_unpack failed"
-	fi
-
-	sed -i	-e "/id-clash-30/d" \
-		-e "/^COPT/d" \
-		-e "s:^\(LDFLAGS = \)\(-static \)\(.*\):\1\3:" \
-		-e "s:^#\(RES_LIB = \)-lresolv:\1/usr/$(get_libdir)/libresolv.a:" \
-		-e "s:staff:root:" \
-		Makefile || die "src_unpack failed"
-
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
 	sed -i  -e "s:^\(# if defined(__alpha).*\):\1 || defined(__x86_64__):" \
-		port.h || die "src_unpack failed"
+		port.h || die "sed failed"
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" COPTS="${CFLAGS}" || die "emake failed"
+	use debug && export DEBUGDEFS="-DDEBUG"
+	emake CC="$(tc-getCC)" RES_LIB=/usr/$(get_libdir)/libresolv.a || die "emake failed"
 }
 
 src_install () {