--- /usr/portage/sys-fs/mdadm/mdadm-3.1.4.ebuild	2010-11-09 14:39:33.000000000 -0500
+++ mdadm-3.1.4.ebuild	2011-01-13 22:24:34.000000000 -0500
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.1.4.ebuild,v 1.8 2010/11/09 19:17:44 armin76 Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
 HOMEPAGE="http://neil.brown.name/blog/mdadm"
@@ -16,24 +16,40 @@
 DEPEND=""
 RDEPEND=">=sys-apps/util-linux-2.16"
 
+# Tests edit values in /proc and run tests on software raid
+# devices. Thus, they shouldn't be run on systems with active software
+# RAID devices.
+RESTRICT="test"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-3.0-dont-make-man.patch
 	epatch "${FILESDIR}"/${PN}-2.6-syslog-updates.patch
 	epatch "${FILESDIR}"/${PN}-2.6.4-mdassemble.patch #211426
+	epatch "${FILESDIR}"/${P}-cflags.patch
 	use static && append-ldflags -static
 
 	sed -i -e 's:-z now::' Makefile || die #331653
 }
 
-src_compile() {
+mdadm_emake() {
 	emake \
-		CROSS_COMPILE=${CHOST}- \
+		CC="$(tc-getCC)" \
 		CWFLAGS="-Wall" \
 		CXFLAGS="${CFLAGS}" \
-		all mdassemble \
-		|| die "emake failed"
+		"$@" \
+		|| die "'emake $@' failed"
+}
+
+src_compile() {
+	mdadm_emake all mdassemble
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
 }
 
 src_install() {