Index: sandbox-2.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.6-r1.ebuild,v
retrieving revision 1.13
diff -u -B -r1.13 sandbox-2.6-r1.ebuild
--- sandbox-2.6-r1.ebuild	5 Sep 2013 09:54:16 -0000	1.13
+++ sandbox-2.6-r1.ebuild	3 Nov 2013 10:04:42 -0000
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.6-r1.ebuild,v 1.13 2013/09/05 09:54:16 vapier Exp $
 
+EAPI=5
 #
 # don't monkey with this ebuild unless contacting portage devs.
 # period.
@@ -43,15 +44,14 @@
 	ABI=${OABI}
 }
 
-src_unpack() {
-	unpacker
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-trace-hppa.patch #425062
 	epatch "${FILESDIR}"/${P}-log-var.patch
 	epatch "${FILESDIR}"/${P}-static-close-fd.patch #364877
 	epatch "${FILESDIR}"/${P}-desktop.patch #443672
 	epatch "${FILESDIR}"/${P}-open-nofollow.patch #413441
 	epatch "${FILESDIR}"/${P}-check-empty-paths-at.patch #346929
+	epatch "${FILESDIR}"/${P}-prefix.patch
 	epatch_user
 }
 
@@ -63,14 +63,10 @@
 
 	einfo "Configuring sandbox for ABI=${ABI}..."
 	ECONF_SOURCE="../${P}/" \
-	econf ${myconf} || die
-}
-
-sb_compile() {
-	emake || die
+	econf ${myconf}
 }
 
-src_compile() {
+src_configure() {
 	filter-lfs-flags #90228
 
 	# Run configures in parallel!
@@ -81,12 +77,18 @@
 	done
 	ABI=${OABI}
 	multijob_finish
+}
 
+sb_compile() {
+	emake
+}
+
+src_compile() {
 	sb_foreach_abi sb_compile
 }
 
 sb_test() {
-	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
 }
 
 src_test() {
@@ -94,9 +96,9 @@
 }
 
 sb_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	insinto /etc/sandbox.d #333131
-	doins etc/sandbox.d/00default || die
+	doins etc/sandbox.d/00default
 }
 
 src_install() {
@@ -113,17 +115,17 @@
 }
 
 pkg_preinst() {
-	chown root:portage "${D}"/var/log/sandbox
-	chmod 0770 "${D}"/var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
 
-	local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
+	local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
 	if [[ -n ${old} ]] ; then
 		elog "Removing old sandbox libraries for you:"
 		elog ${old//${ROOT}}
-		find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \;
+		find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \;
 	fi
 }
 
 pkg_postinst() {
-	chmod 0755 "${ROOT}"/etc/sandbox.d #265376
+	chmod 0755 "${EROOT}"/etc/sandbox.d #265376
 }