--- /usr/portage/app-admin/gkrellm/gkrellm-2.2.9.ebuild	2006-06-18 15:35:22.000000000 +0100
+++ gkrellm-2.2.9.ebuild	2006-06-20 22:08:07.000000000 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.9.ebuild,v 1.2 2006/06/18 14:32:21 malc Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Single process stack of various system monitors"
 HOMEPAGE="http://www.gkrellm.net/"
@@ -30,6 +30,7 @@
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-gnutls.patch
 	epatch "${FILESDIR}"/gkrellm-mbmon-amd64.patch
 
@@ -45,17 +46,16 @@
 src_compile() {
 	if use X ; then
 		emake \
+			CC=$(tc-getCC) \
 			INSTALLROOT=/usr \
 			INCLUDEDIR=/usr/include/gkrellm2 \
-			LINK_FLAGS="${LDFLAGS}" \
 			$(use nls || echo enable_nls=0) \
 			$(use gnutls || echo without_gnutls=yes) \
 			$(use ssl || echo without_ssl=yes) \
 			|| die "emake failed"
 	else
 		cd server
-		emake LINK_FLAGS="${LDFLAGS}" \
-			|| die "emake failed"
+		emake || die "emake failed"
 	fi
 }
 
@@ -64,7 +64,6 @@
 		make install \
 			$(use nls || echo enable_nls=0) \
 			INSTALLDIR="${D}"/usr/bin \
-			MANDIR="${T}" \
 			INCLUDEDIR="${D}"/usr/include \
 			LOCALEDIR="${D}"/usr/share/locale \
 			PKGCONFIGDIR="${D}"/usr/$(get_libdir)/pkgconfig \
@@ -84,8 +83,7 @@
 		doins server/gkrellmd.h
 	fi
 
-	doinitd "${FILESDIR}"/gkrellmd \
-		|| die "doinitd failed"
+	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
 
 	insinto /etc
 	doins server/gkrellmd.conf