--- /usr/portage/mail-filter/libdomainkeys/libdomainkeys-0.68-r1.ebuild	2009-04-05 11:08:24.000000000 +0300
+++ /usr/portage/mail-filter/libdomainkeys/libdomainkeys-0.68-r1.ebuild	2010-01-03 14:52:24.000000000 +0200
@@ -2,6 +2,8 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-filter/libdomainkeys/libdomainkeys-0.68-r1.ebuild,v 1.16 2007/11/16 20:45:28 nixnut Exp $
 
+EAPI="2"
+
 inherit eutils
 
 DESCRIPTION="libdomainkeys is a library usable by MTAs to verify and create signatures of e-mail headers."
@@ -12,33 +14,39 @@ 
 LICENSE="libdomainkeys-1.1"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=sys-devel/libtool-1.4.1-r8
 		dev-libs/openssl"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:-lcrypto:-lcrypto -lresolv:" ${S}/Makefile
+src_prepare() {
+	# fix libs, dump hardcoded vars to respect CC (bug #244142) and CFLAGS (bug #240782)
+	sed -i -e 's:-lcrypto:-lcrypto -lresolv:' \
+		-e 's:^CC=:#CC=:' -e 's:^CFLAGS=:#CFLAGS=:' \
+		${S}/Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="-DBIND_8_COMPAT ${CFLAGS}" || die
 }
 
 src_install() {
 	insinto /usr/lib
-	doins libdomainkeys.a
+	doins libdomainkeys.a || die
 
 	insinto /usr/include
-	doins domainkeys.h
-	doins dktrace.h
+	doins domainkeys.h || die
+	doins dktrace.h || die
 
-	dobin dknewkey dktest
-	dodoc README CHANGES *.html
+	dobin dknewkey dktest || die
+	dodoc README CHANGES *.html || die
 
 	# remove unwanted doc files
-	rm -rf ${S}/testcases/CVS
-	rm -rf ${S}/testcases/*~
+	rm -rf ${S}/testcases/CVS || die
+	rm -rf ${S}/testcases/*~ || die
 	docinto /testcases
-	dodoc testcases/*
-	prepalldocs
+	dodoc testcases/* || die
+	prepalldocs || die
 }