--- foldingathome-6.02-r1.ebuild.orig	2010-03-13 19:13:33.000000000 +0100
+++ foldingathome-6.02-r1.ebuild	2010-03-13 19:14:17.000000000 +0100
@@ -1,4 +1,4 @@
-# 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/sci-biology/foldingathome/foldingathome-6.02-r1.ebuild,v 1.2 2008/11/22 22:04:33 je_fro Exp $
 
@@ -12,23 +12,23 @@
 
 LICENSE="folding-at-home"
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-libs/glibc-2.3.0
 		amd64? ( app-emulation/emul-linux-x86-baselibs )"
-
 RDEPEND=""
 
 S="${WORKDIR}"
 
+QA_PRESTRIPPED="opt/foldingathome/fah6"
+
 src_install() {
 	exeinto ${I}
-	newexe "${FILESDIR}"/${PV}/initfolding initfolding
-	doexe fah6 mpiexec
-	newconfd "${FILESDIR}"/${PV}/folding-conf.d foldingathome
-	newinitd "${FILESDIR}"/${PV}/fah-init foldingathome
+	newexe "${FILESDIR}"/${PV}/initfolding initfolding || die
+	doexe fah6 mpiexec || die
+	newconfd "${FILESDIR}"/${PV}/folding-conf.d foldingathome || die
+	newinitd "${FILESDIR}"/${PV}/fah-init foldingathome || die
 }
 
 pkg_preinst() {
@@ -46,11 +46,9 @@
 	einfo ""
 	einfo "I encourage you to acquire a username and join team 36480."
 	einfo "http://folding.stanford.edu/English/Download#ntoc2"
-	einfo ""
 }
 
 pkg_postrm() {
 	einfo "Folding@home data files were not removed."
 	einfo " Remove them manually from ${I}"
-	einfo ""
 }