--- thttpd-2.25b-r7.ebuild	2010-08-09 23:33:47.534981999 +0200
+++ thttpd-2.25b-r8.ebuild	2010-08-09 23:00:47.672981999 +0200
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r7.ebuild,v 1.7 2009/08/09 13:39:07 ssuominen Exp $
+# $Header: $
+
+EAPI=2
 
 inherit eutils flag-o-matic
 
@@ -18,24 +20,27 @@
 THTTPD_USER=thttpd
 THTTPD_GROUP=thttpd
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${MY_P}/*.diff
 	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 }
 
 pkg_setup() {
+	ebegin "Creating thttpd user and group"
 	enewgroup ${THTTPD_GROUP}
-	enewuser ${THTTPD_USER}  -1 -1 -1 ${THTTPD_GROUP}
+	enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP}
+	eend ${?}
 }
 
-src_compile() {
+src_configure() {
 	## TODO: what to do with IPv6?
+	## apparently ipv6 is supported out-of-the-box
 	use static && append-ldflags -static
-
 	econf || die "econf failed"
-	emake || die "emake failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install () {