--- nagios-core-2.9-r1.ebuild.old	2007-06-10 10:07:01.918445996 +0200
+++ nagios-core-2.9-r1.ebuild	2007-06-10 10:05:13.000000000 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.9-r1.ebuild,v 1.2 2007/06/06 08:14:05 jokey Exp $
 
-inherit eutils apache-module toolchain-funcs gnuconfig
+inherit eutils apache-module toolchain-funcs
 
 MY_P=${PN/-core}-${PV/_}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
@@ -45,11 +45,11 @@
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	epatch ${FILESDIR}/2.x-series-nsca.patch
+
 	local strip="$(echo '$(MAKE) strip-post-install')"
 	sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
-	# ppc64 needs this
-	gnuconfig_update
 }
 
 src_compile() {
@@ -75,14 +75,12 @@
 		myconf="${myconf} --with-command-grp=apache"
 	fi
 
-	./configure ${myconf} \
-		--host=${CHOST} \
+	econf ${myconf} \
 		--prefix=/usr/nagios \
 		--localstatedir=/var/nagios \
 		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
+		--datadir=/usr/nagios/share \
+		|| die "./configure failed"
 
 	emake CC=$(tc-getCC) nagios || die "make failed"