Use edo.

exlibs/cdemu-common.exlib

@@ -35,7 +35,7 @@ src_prepare() {
 
     if [[ "${PV}" == scm ]] ; then
         if ${WANT_AUTOGEN} ; then
-            ./autogen.sh || die "autogen.sh failed"
+            edo ./autogen.sh
         fi
     fi
 }

exlibs/djb.exlib

@@ -18,35 +18,35 @@ djb_src_prepare() {
     local basedir=$(dirname $(find -type f -name conf-cc))
     local ranlib_file=$(grep -r ranlib . | sed 's/:.*//')
 
-    sed \
+    edo sed \
         -e "/^gcc/s:.*:& ${CPPFLAGS} ${CFLAGS}:" \
         -e "/^gcc/s:gcc:${CC}:" \
-        -i "${basedir}/conf-cc" || die "sed ${basedir}/conf-cc failed"
+        -i "${basedir}/conf-cc"
 
-    sed \
+    edo sed \
         -e "/^gcc/s:.*:& ${LDFLAGS}:" \
         -e "/^gcc/s:gcc:${LD}:" \
-        -i "${basedir}/conf-ld" || die "sed ${basedir}/conf-ld failed"
+        -i "${basedir}/conf-ld"
 
-    sed \
+    edo sed \
         -e "/echo 'ar cr/s:ar:${AR}:" \
         -e "/*) echo 'ranlib \"\\$/s:ranlib:${RANLIB}:" \
-        -i "${ranlib_file}" || die "sed ${ranlib_file} failed"
+        -i "${ranlib_file}"
 
     if [ -f "${basedir}/auto-str.c" ] ; then
-        cat >> "${basedir}/auto-str" <<EOF
+        edo cat >> "${basedir}/auto-str" <<EOF
 #!/bin/bash
 printf "const char \${1}[] = \"%s\";\n" \$(printf "\${2}" | od -A n -t o1 | tr ' ' '\\')
 EOF
-        chmod u+x "${basedir}/auto-str" || die "chmod auto-str failed"
+        edo chmod u+x "${basedir}/auto-str"
     fi
 
     if [ -f "${basedir}/hasshsgr.h1" ] ; then
-        ln -s hasshsgr.h1 "${basedir}"/hasshsgr.h
+        edo ln -s hasshsgr.h1 "${basedir}"/hasshsgr.h
     fi
 
     if [ -f "${basedir}/uint64.h1" ] ; then
-        cat >> "${basedir}/uint64.h" <<EOF
+        edo cat >> "${basedir}/uint64.h" <<EOF
 #ifndef UINT64_H
 #define UINT64_H
 
@@ -60,8 +60,7 @@ EOF
     fi
 
     if [ -f "${basedir}/conf-home" ] ; then
-        echo /usr > "${basedir}/conf-home" \
-            || die "creating conf-home failed"
+        edo echo /usr > "${basedir}/conf-home"
     fi
  
     default

packages/app-cdr/bin2iso/bin2iso-1.9b.exheres-0

@@ -24,8 +24,7 @@ src_unpack() {
 }
 
 src_compile() {
-    "${CC}" ${CFLAGS} ${LDFLAGS} -o "${SRC}.out" "${FETCHEDDIR}/${SRC}" \
-        || die "compilation failed"
+    edo "${CC}" ${CFLAGS} ${LDFLAGS} -o "${SRC}.out" "${FETCHEDDIR}/${SRC}"
 }
 
 src_install() {

packages/app-emulation/qemu/qemu.exlib

@@ -64,7 +64,7 @@ qemu_src_configure ()
     option curl || myconf+=( --disable-curl )
     [[ -n "${audio_drv[@]}" ]] && myconf+=( --enable-mixemu )
 
-    ./configure \
+    edo ./configure \
         --prefix=/usr \
         --host-cc="${BUILD_CC}" \
         --cc="${CC}" \
@@ -74,16 +74,14 @@ qemu_src_configure ()
         --audio-drv-list="$(echo ${audio_drv[@]} | tr ' ' ',')" \
         ${myconf[@]} \
         ${EXTRA_ECONF} \
-        $@ \
-        || die "configure failed"
+        $@
 }
 
 qemu_src_prepare ()
 {
-    sed \
+    edo sed \
         -e '/^CFLAGS=/s:-O2 -g::' \
         -e '/^LDFLAGS=/s:-g::' \
-        -i configure \
-        || die "sed configure failed";
+        -i configure
 }
 

packages/app-emulation/vhba-module/vhba-module.exlib

@@ -20,7 +20,7 @@ vhba-module_src_compile() {
 
 vhba-module_src_install() {
     dodir /usr/src
-    cp -pPR "${WORK}" "${IMAGE}/usr/src/${PNV}"
+    edo cp -pPR "${WORK}" "${IMAGE}/usr/src/${PNV}"
 
     insinto /etc/udev/rules.d
     hereins 90-vhba.rules <<EOF

packages/app-text/tofrodos/tofrodos-1.7.8.exheres-0

@@ -23,12 +23,12 @@ WORK="$WORKBASE/$PN/src"
 src_prepare() {
     default
 
-    sed \
+    edo sed \
         -e "/CC =/s:gcc:${CC}:" \
         -e "/LD =/s:gcc:${CC}:" \
         -e "/CFLAGS =/s:\$(CDEBUG):$CFLAGS:" \
         -e "/LDFLAGS =/s:\$(LDEBUG):$LDFLAGS:" \
-        -i Makefile || die "sed Makefile failed"
+        -i Makefile
 }
 
 src_install() {

packages/games-strategy/jaggedalliance2-stracciatella/jaggedalliance2-stracciatella.exlib

@@ -30,15 +30,15 @@ UPSTREAM_CHANGELOG="http://tron.homeunix.org/ja2"
 
 ja2_config() {
     until [ $# -eq 0 ] ; do
-        echo "$1" >> config.default
+        edo echo "$1" >> config.default
         shift
     done
 }
 
 src_prepare() {
-    sed -e "s:TILECACHE:[Tt][Ii][Ll][Ee][Cc][Aa][Cc][Hh][Ee]:g" \
+    edo sed -e "s:TILECACHE:[Tt][Ii][Ll][Ee][Cc][Aa][Cc][Hh][Ee]:g" \
         -e '/^INSTALL_PROGRAM ?= /s: -s::' \
-        -i Makefile || die "sed Makefile failed"
+        -i Makefile
     option debug && ja2_config _DEBUG=yes WITH_SOUND_DEBUG=yes
     option demo && ja2_config WITH_DEMO=yes
     option editor && ja2_config JA2EDITOR=yes

packages/sys-apps/daemontools/daemontools-0.76.exheres-0

@@ -32,8 +32,8 @@ DEFAULT_SRC_PREPARE_PATCHES+=(
 DEFAULT_SRC_INSTALL_EXTRA_SUBDIRS+=( src )
 
 src_compile() {
-    echo >src/rts.tests || "overwriting tests failed"
-    package/compile || die "compilation failed"
+    edo echo >src/rts.tests
+    edo package/compile
 }
 
 src_install() {

packages/sys-apps/usbip/usbip.exlib

@@ -31,16 +31,15 @@ DEFAULT_SRC_CONFIGURE_OPTION_WITHS+=( 'tcpd tcp-wrappers' )
 WORK="${WORK}/src"
 
 src_prepare() {
-    sed \
+    edo sed \
         -e "/^AM_CFLAGS = /s:= := -DUSBIDS_FILE='\"@USBIDS_DIR@/usb.ids\"' :" \
-        -i cmd/Makefile.am \
-        || die "sed cmd/Makefile.am failed"
+        -i cmd/Makefile.am
     autotools_src_prepare
 }
 
 src_install() {
     default
 
-    rmdir "${IMAGE}/usr/share/usbip"
+    edo rmdir "${IMAGE}/usr/share/usbip"
 }
 

packages/sys-fs/xfsprogs/xfsprogs-3.1.1.exheres-0

@@ -21,11 +21,11 @@ DEFAULT_SRC_INSTALL_PARAMS+=( DIST_ROOT="$IMAGE" )
 
 src_prepare() {
     default
-    sed -e "/^PKG_DOC_DIR\t=/s:@pkg_name@:$PNV:" -i include/builddefs.in || die "sed failed"
+    edo sed -e "/^PKG_DOC_DIR\t=/s:@pkg_name@:$PNV:" -i include/builddefs.in
 }
 
 src_install() {
     default
-    rm "$IMAGE/usr/share/doc/$PNV/release.sh" || die "failed to remove release.sh"
+    edo rm "$IMAGE/usr/share/doc/$PNV/release.sh"
 }