--- /usr/portage/app-misc/secure-delete/secure-delete-3.1.ebuild	2008-12-30 15:35:20.000000000 -0500
+++ secure-delete-3.1.ebuild	2010-08-10 10:50:21.000000000 -0400
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-misc/secure-delete/secure-delete-3.1.ebuild,v 1.9 2008/12/30 20:20:14 angelos Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
 
 MY_P=${PN//-/_}-${PV}
 S=${WORKDIR}/${MY_P}
@@ -30,12 +30,13 @@
 
 	# the kernel module will not compile without smp support and there is no
 	# good way to ensure that a user has it
-	epatch "${FILESDIR}"/${PN}-3.1-do-not-use-the-kernel-module.patch
+	epatch "${FILESDIR}"/${PN}-3.1-do-not-use-the-kernel-module.patch \
+		"${FILESDIR}"/${P}-makefile.patch
 }
 
 src_compile() {
-	emake -j1 OPT="${CFLAGS} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
-		CC="$(tc-getCC)" || die "emake failed"
+	append-flags "-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
@@ -45,7 +46,7 @@
 		DOC_DIR="${D}"/usr/share/doc/${PF} \
 		install || die "emake install failed"
 
-	dodoc secure_delete.doc usenix6-gutmann.doc
+	dodoc secure_delete.doc usenix6-gutmann.doc || die
 }
 
 pkg_postinst() {