diff -ru a/gkrellm-mailwatch-2.4.3.ebuild b/gkrellm-mailwatch-2.4.3.ebuild
--- a/gkrellm-mailwatch-2.4.3.ebuild	2010-03-12 01:07:11.000000000 +0000
+++ b/gkrellm-mailwatch-2.4.3.ebuild	2010-08-30 02:59:01.400651139 +0000
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3.ebuild,v 1.11 2010/03/12 00:43:24 sping Exp $
 
-inherit gkrellm-plugin
+EAPI="2"
+
+inherit gkrellm-plugin toolchain-funcs
 
 IUSE=""
 S=${WORKDIR}/${PN}
@@ -15,3 +17,14 @@
 KEYWORDS="alpha amd64 ppc sparc x86"
 
 PLUGIN_SO=mailwatch.so
+
+src_prepare() {
+	sed -i \
+		-e 's/-O2 //' \
+		-e 's/\t\$(CC) /&$(LDFLAGS) /' \
+		Makefile || die
+	# Not exactly correct since the package is not compiled until src_compile,
+	# but CC stays in the environment and has the desired effect.  This avoids
+	# writing a src_compile for the ebuild.
+	tc-export CC
+}